From cb6fd7d2f97d3194535a5e014cf5b7f210223d8e Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Tue, 15 Nov 2022 13:42:59 -0700
Subject: [PATCH 1/9] Models that use a `allOf` embed the fields of the
 referenced model directly, so doing an `allOf` that referenced a model
 containing a `time.Time` object would not import `time`.

Swap around the logic to instead remove the models that are not embedded but instead referenced via `oneOf` and `anyOf`.
---
 .../codegen/languages/AbstractGoCodegen.java  | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index d436a01c42f..825842f0cca 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -632,39 +632,21 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
             boolean addedOSImport = false;
             CodegenModel model = m.getModel();
 
-            List<CodegenProperty> inheritedProperties = new ArrayList<>();
             if (model.getComposedSchemas() != null) {
-                if (model.getComposedSchemas().getAllOf() != null) {
-                    inheritedProperties.addAll(model.getComposedSchemas().getAllOf());
-                }
                 if (model.getComposedSchemas().getAnyOf() != null) {
-                    inheritedProperties.addAll(model.getComposedSchemas().getAnyOf());
+                    model.vars.removeAll(model.getComposedSchemas().getAnyOf());
                 }
                 if (model.getComposedSchemas().getOneOf() != null) {
-                    inheritedProperties.addAll(model.getComposedSchemas().getOneOf());
+                    model.vars.removeAll(model.getComposedSchemas().getOneOf());
                 }
             }
 
-            List<CodegenProperty> codegenProperties = new ArrayList<>();
-            if(model.getIsModel() || model.getComposedSchemas() == null) {
-                // If the model is a model, use model.vars as it only
-                // contains properties the generated struct will own itself.
-                // If model is no model and it has no composed schemas use
-                // model.vars.
-                codegenProperties.addAll(model.vars);
-            } else {
-                // If the model is no model, but is a
-                // allOf, anyOf or oneOf, add all first level options
-                // from allOf, anyOf or oneOf.
-                codegenProperties.addAll(inheritedProperties);
-            }
-
-            for (CodegenProperty cp : codegenProperties) {
-                if (!addedTimeImport && ("time.Time".equals(cp.dataType) ||
-                        (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
+            for (CodegenProperty cp : model.vars) {
+                if (!addedTimeImport && ("time.Time".equals(cp.dataType) || (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
                     imports.add(createMapping("import", "time"));
                     addedTimeImport = true;
                 }
+
                 if (!addedOSImport && ("*os.File".equals(cp.dataType) ||
                         (cp.items != null && "*os.File".equals(cp.items.dataType)))) {
                     imports.add(createMapping("import", "os"));
@@ -676,11 +658,6 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
                 imports.add(createMapping("import", "fmt"));
             }
 
-            // if oneOf contains "time.Time" type
-            if (!addedTimeImport && model.oneOf != null && model.oneOf.contains("time.Time")) {
-                imports.add(createMapping("import", "time"));
-            }
-
             // if oneOf contains "null" type
             if (model.oneOf != null && !model.oneOf.isEmpty() && model.oneOf.contains("nil")) {
                 model.isNullable = true;
-- 
GitLab


From 0e247efbe37f6c9f34187ffc0a32a461e121ff10 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Wed, 16 Nov 2022 15:05:27 -0700
Subject: [PATCH 2/9] If a model has an `allOf`, those items are inline defined
 in the resulting code so any `time` or `os` imports need to be included.

---
 README.md                                     | 1438 ++++-------------
 .../codegen/languages/AbstractGoCodegen.java  |   23 +-
 ...odels-for-testing-with-http-signature.yaml |   22 +
 .../go/go-petstore/.openapi-generator/FILES   |    6 +
 .../client/petstore/go/go-petstore/README.md  |    3 +
 .../petstore/go/go-petstore/api/openapi.yaml  |   24 +
 6 files changed, 348 insertions(+), 1168 deletions(-)

diff --git a/README.md b/README.md
index 44f309a1932..e08972d5b1d 100644
--- a/README.md
+++ b/README.md
@@ -1,1214 +1,322 @@
-<h1 align="center">OpenAPI Generator</h1>
-
-
-<div align="center">
-
-[![Stable releases in Maven Central](https://img.shields.io/maven-metadata/v/https/repo1.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22) [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-orange)](./LICENSE) [![Open Collective backers](https://img.shields.io/opencollective/backers/openapi_generator?color=orange&label=OpenCollective%20Backers)](https://opencollective.com/openapi_generator) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g) [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator) [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/OpenAPITools/openapi-generator)
-
-</div>
-
-<div align="center">
-
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`6.3.0`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/openapitools/openapi-generator/Check%20Supported%20Java%20Versions/master?label=Check%20Supported%20Java%20Versions&logo=github&logoColor=green)](https://github.com/OpenAPITools/openapi-generator/actions?query=workflow%3A%22Check+Supported+Java+Versions%22)
-
-[7.0.x](https://github.com/OpenAPITools/openapi-generator/tree/7.0.x) (`7.0.x`):
-[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/7.0.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/7.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=7.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
-[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/7.0.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
-
-</div>
-
-<div align="center">
-
-:star::star::star: If you would like to contribute, please refer to [guidelines](CONTRIBUTING.md) and a list of [open tasks](https://github.com/openapitools/openapi-generator/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).:star::star::star:
-
-:bangbang: To migrate from Swagger Codegen to OpenAPI Generator, please refer to the [migration guide](docs/migration-from-swagger-codegen.md) :bangbang:
-
-:notebook_with_decorative_cover: For more information, please refer to the [Wiki page](https://github.com/openapitools/openapi-generator/wiki) and [FAQ](https://github.com/openapitools/openapi-generator/wiki/FAQ) :notebook_with_decorative_cover:
-
-:notebook_with_decorative_cover: The eBook [A Beginner's Guide to Code Generation for REST APIs](https://gum.co/openapi_generator_ebook) is a good starting point for beginners :notebook_with_decorative_cover:
-
-:warning: If the OpenAPI spec, templates or any input (e.g. options, environment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)). For security vulnerabilities, please contact [team@openapitools.org](mailto:team@openapitools.org). :warning:
-
-:bangbang: Both "OpenAPI Tools" (https://OpenAPITools.org - the parent organization of OpenAPI Generator) and "OpenAPI Generator" are not affiliated with OpenAPI Initiative (OAI) :bangbang:
-
-</div>
-
-## Sponsors
-
-If you find OpenAPI Generator useful for work, please consider asking your company to support this Open Source project by [becoming a sponsor](https://opencollective.com/openapi_generator). You can also individually sponsor the project by [becoming a backer](https://opencollective.com/openapi_generator).
-
-#### Thank you to our bronze sponsors!
-
-[![NamSor](https://openapi-generator.tech/img/companies/namsor.png)](https://www.namsor.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/docspring.png" width="128" height="128">](https://docspring.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/datadog.png" width="128" height="128">](https://datadoghq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/thales.jpg" width="128" height="128">](https://cpl.thalesgroup.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/apideck.jpg" width="128" height="128">](https://www.apideck.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/pexa.png" width="128" height="128">](https://www.pexa.com.au/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/numary.png" width="128" height="128">](https://www.numary.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/onesignal.png" width="128" height="128">](https://www.onesignal.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/virtualansoftware.png" width="128" height="128">](https://www.virtualansoftware.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/mergedev.jpeg" width="128" height="128">](https://www.merge.dev/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/burkert.jpg" width="128" height="128">](https://www.burkert.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/finbourne.png" width="128" height="128">](https://www.finbourne.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-
-#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
-
-[<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRAhEYadUyZYzGUotZiSdXkVMqqLGuohyixLl4eUpUV6pAbUULL" width="150">](https://checklyhq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+# Go API client for openapi
 
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
-
-|                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                                                           |
-| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-
-## Table of contents
-
-  - [OpenAPI Generator](#openapi-generator)
-  - [Overview](#overview)
-  - [Table of Contents](#table-of-contents)
-  - [1 - Installation](#1---installation)
-    - [1.1 - Compatibility](#11---compatibility)
-    - [1.2 - Artifacts on Maven Central](#12---artifacts-on-maven-central)
-    - [1.3 - Download JAR](#13---download-jar)
-    - [1.4 - Build Projects](#14---build-projects)
-    - [1.5 - Homebrew](#15---homebrew)
-    - [1.6 - Docker](#16---docker)
-    - [1.7 - NPM](#17---npm)
-  - [2 - Getting Started](#2---getting-started)
-  - [3 - Usage](#3---usage)
-    - [3.1 - Customization](#31---customization)
-    - [3.2 - Workflow Integration](#32---workflow-integration-maven-gradle-github-cicd)
-    - [3.3 - Online Generators](#33---online-openapi-generator)
-    - [3.4 - License Information on Generated Code](#34---license-information-on-generated-code)
-    - [3.5 - IDE Integration](#35---ide-integration)
-  - [4 - Companies/Projects using OpenAPI Generator](#4---companiesprojects-using-openapi-generator)
-  - [5 - Presentations/Videos/Tutorials/Books](#5---presentationsvideostutorialsbooks)
-  - [6 - About Us](#6---about-us)
-    - [6.1 - OpenAPI Generator Core Team](#61---openapi-generator-core-team)
-    - [6.2 - OpenAPI Generator Technical Committee](#62---openapi-generator-technical-committee)
-    - [6.3 - History of OpenAPI Generator](#63---history-of-openapi-generator)
-  - [7 - License](#7---license)
-
-## [1 - Installation](#table-of-contents)
-
-### [1.1 - Compatibility](#table-of-contents)
-
-The OpenAPI Specification has undergone 3 revisions since initial creation in 2010.  The openapi-generator project has the following compatibilities with the OpenAPI Specification:
-
-| OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | Feb/Mar 2023   | Major release with breaking changes (no fallback) |
-| 6.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.3.0-SNAPSHOT/) | 05.12.2022   | Minor release with breaking changes (with fallback) |
-| [6.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.2.1) (latest stable release)                                                    | 01.11.2022   | Patch release (enhancements, bug fixes, etc) |
-| [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
-| [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
-
-OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
-
-For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.
-
-## [1.2 - Artifacts on Maven Central](#table-of-contents)
-
-You can find our released artifacts on maven central:
-
-**Core:**
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>openapi-generator</artifactId>
-    <version>${openapi-generator-version}</version>
-</dependency>
-```
-See the different versions of the [openapi-generator](https://search.maven.org/artifact/org.openapitools/openapi-generator) artifact available on maven central.
-
-**Cli:**
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>openapi-generator-cli</artifactId>
-    <version>${openapi-generator-version}</version>
-</dependency>
-```
-See the different versions of the [openapi-generator-cli](https://search.maven.org/artifact/org.openapitools/openapi-generator-cli) artifact available on maven central.
-
-**Maven plugin:**
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>${openapi-generator-version}</version>
-</dependency>
-```
-* See the different versions of the [openapi-generator-maven-plugin](https://search.maven.org/artifact/org.openapitools/openapi-generator-maven-plugin) artifact available on maven central.
-* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md)
-
-**Gradle plugin:**
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>openapi-generator-gradle-plugin</artifactId>
-    <version>${openapi-generator-version}</version>
-</dependency>
-```
-* See the different versions of the [openapi-generator-gradle-plugin](https://search.maven.org/artifact/org.openapitools/openapi-generator-gradle-plugin) artifact available on maven central.
-* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc)
-
-### [1.3 - Download JAR](#table-of-contents)
-<!-- RELEASE_VERSION -->
-If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
-
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar`
-
-For **Mac/Linux** users:
-```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar -O openapi-generator-cli.jar
-```
-
-For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
-```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar
-```
-
-After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
-
-For Mac users, please make sure Java 8 is installed (Tips: run `java -version` to check the version), and export `JAVA_HOME` in order to use the supported Java version:
-```sh
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-export PATH=${JAVA_HOME}/bin:$PATH
-```
-<!-- /RELEASE_VERSION -->
-### Launcher Script
-
-One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
-
-To install the launcher script, copy the contents of the script to a location on your path and make the script executable.
-
-An example of setting this up (NOTE: Always evaluate scripts curled from external systems before executing them).
-
-```
-mkdir -p ~/bin/openapitools
-curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli
-chmod u+x ~/bin/openapitools/openapi-generator-cli
-export PATH=$PATH:~/bin/openapitools/
-```
-
-Now, `openapi-generator-cli` is "installed". On invocation, it will query the GitHub repository for the most recently released version. If this matches the last downloaded jar,
-it will execute as normal. If a newer version is found, the script will download the latest release and execute it.
-
-If you need to invoke an older version of the generator, you can define the variable `OPENAPI_GENERATOR_VERSION` either ad hoc or globally. You can export this variable if you'd like to persist a specific release version.
-
-Examples:
-
-```
-# Execute latest released openapi-generator-cli
-openapi-generator-cli version
-
-# Execute version 4.1.0 for the current invocation, regardless of the latest released version
-OPENAPI_GENERATOR_VERSION=4.1.0 openapi-generator-cli version
-
-# Execute version 4.1.0-SNAPSHOT for the current invocation
-OPENAPI_GENERATOR_VERSION=4.1.0-SNAPSHOT openapi-generator-cli version
-
-# Execute version 4.0.2 for every invocation in the current shell session
-export OPENAPI_GENERATOR_VERSION=4.0.2
-openapi-generator-cli version # is 4.0.2
-openapi-generator-cli version # is also 4.0.2
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
 
-# To "install" a specific version, set the variable in .bashrc/.bash_profile
-echo "export OPENAPI_GENERATOR_VERSION=4.0.2" >> ~/.bashrc
-source ~/.bashrc
-openapi-generator-cli version # is always 4.0.2, unless any of the above overrides are done ad hoc
-```
-
-### [1.4 - Build Projects](#table-of-contents)
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build package: org.openapitools.codegen.languages.GoClientCodegen
 
-To build from source, you need the following installed and available in your `$PATH:`
+## Installation
 
-* [Java 8](https://www.oracle.com/technetwork/java/index.html)
+Install the following dependencies:
 
-* [Apache Maven 3.3.4 or greater](https://maven.apache.org/)
-
-After cloning the project, you can build it from source with this command:
-```sh
-mvn clean install
+```shell
+go get github.com/stretchr/testify/assert
+go get golang.org/x/oauth2
+go get golang.org/x/net/context
 ```
 
-If you don't have maven installed, you may directly use the included [maven wrapper](https://github.com/takari/maven-wrapper), and build with the command:
-```sh
-./mvnw clean install
-```
+Put the package under your project folder and add the following in import:
 
-The default build contains minimal static analysis (via CheckStyle). To run your build with PMD and Spotbugs, use the `static-analysis` profile:
-
-```sh
-mvn -Pstatic-analysis clean install
+```golang
+import openapi "github.com/GIT_USER_ID/GIT_REPO_ID"
 ```
 
-### [1.5 - Homebrew](#table-of-contents)
-
-To install, run `brew install openapi-generator`
+To use a proxy, set the environment variable `HTTP_PROXY`:
 
-Here is an example usage to generate a Ruby client:
-```sh
-openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g ruby -o /tmp/test/
+```golang
+os.Setenv("HTTP_PROXY", "http://proxy_name:proxy_port")
 ```
 
-To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
-
-To install OpenJDK (pre-requisites), please run
-```sh
-brew tap AdoptOpenJDK/openjdk
-brew install --cask adoptopenjdk12
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
-```
-
-To install Maven, please run
-```sh
-brew install maven
-```
-
-### [1.6 - Docker](#table-of-contents)
-
-#### Public Pre-built Docker images
-
- - [https://hub.docker.com/r/openapitools/openapi-generator-cli/](https://hub.docker.com/r/openapitools/openapi-generator-cli/) (official CLI)
- - [https://hub.docker.com/r/openapitools/openapi-generator-online/](https://hub.docker.com/r/openapitools/openapi-generator-online/) (official web service)
-
-
-#### OpenAPI Generator CLI Docker Image
-
-The OpenAPI Generator image acts as a standalone executable. It can be used as an alternative to installing via homebrew, or for developers who are unable to install Java or upgrade the installed version.
-
-To generate code with this image, you'll need to mount a local location as a volume.
-
-Example:
-
-```sh
-docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-    -g go \
-    -o /local/out/go
-```
-
-The generated code will be located under `./out/go` in the current directory.
-
-#### OpenAPI Generator Online Docker Image
-
-The openapi-generator-online image can act as a self-hosted web application and API for generating code. This container can be incorporated into a CI pipeline, and requires at least two HTTP requests and some docker orchestration to access generated code.
-
-Example usage:
-
-```sh
-# Start container at port 8888 and save the container id
-> CID=$(docker run -d -p 8888:8080 openapitools/openapi-generator-online)
+## Configuration of Server URL
 
-# allow for startup
-> sleep 10
-
-# Get the IP of the running container (optional)
-GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}'  $CID)
-
-# Execute an HTTP request to generate a Ruby client
-> curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' \
--d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
-'http://localhost:8888/api/gen/clients/ruby'
-
-{"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}
-
-# Download the generated zip file
-> wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Unzip the file
-> unzip c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Shutdown the openapi generator image
-> docker stop $CID && docker rm $CID
+Default configuration comes with `Servers` field that contains server objects as defined in the OpenAPI specification.
+
+### Select Server Configuration
+
+For using other server than the one defined on index 0 set context value `sw.ContextServerIndex` of type `int`.
+
+```golang
+ctx := context.WithValue(context.Background(), openapi.ContextServerIndex, 1)
+```
+
+### Templated Server URL
+
+Templated server URL is formatted using default variables from configuration or from context value `sw.ContextServerVariables` of type `map[string]string`.
+
+```golang
+ctx := context.WithValue(context.Background(), openapi.ContextServerVariables, map[string]string{
+	"basePath": "v2",
+})
+```
+
+Note, enum values are always validated and all unused variables are silently ignored.
+
+### URLs Configuration per Operation
+
+Each operation can use different server URL defined using `OperationServers` map in the `Configuration`.
+An operation is uniquely identified by `"{classname}Service.{nickname}"` string.
+Similar rules for overriding default operation server index and variables applies by using `sw.ContextOperationServerIndices` and `sw.ContextOperationServerVariables` context maps.
+
+```golang
+ctx := context.WithValue(context.Background(), openapi.ContextOperationServerIndices, map[string]int{
+	"{classname}Service.{nickname}": 2,
+})
+ctx = context.WithValue(context.Background(), openapi.ContextOperationServerVariables, map[string]map[string]string{
+	"{classname}Service.{nickname}": {
+		"port": "8443",
+	},
+})
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **Patch** /another-fake/dummy | To test special tags
+*DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **Get** /foo | 
+*FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **Get** /fake/health | Health check endpoint
+*FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **Post** /fake/outer/boolean | 
+*FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **Post** /fake/outer/composite | 
+*FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **Post** /fake/outer/number | 
+*FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **Post** /fake/outer/string | 
+*FakeApi* | [**TestBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **Put** /fake/body-with-file-schema | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **Put** /fake/body-with-query-params | 
+*FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **Patch** /fake | To test \&quot;client\&quot; model
+*FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **Post** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**TestEnumParameters**](docs/FakeApi.md#testenumparameters) | **Get** /fake | To test enum parameters
+*FakeApi* | [**TestGroupParameters**](docs/FakeApi.md#testgroupparameters) | **Delete** /fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**TestInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **Post** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**TestJsonFormData**](docs/FakeApi.md#testjsonformdata) | **Get** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**TestQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **Put** /fake/test-query-parameters | 
+*FakeApi* | [**TestUniqueItemsHeaderAndQueryParameterCollectionFormat**](docs/FakeApi.md#testuniqueitemsheaderandqueryparametercollectionformat) | **Put** /fake/test-unique-parameters | 
+*FakeClassnameTags123Api* | [**TestClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **Patch** /fake_classname_test | To test class name in snake case
+*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **Post** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **Delete** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **Get** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **Get** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **Get** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **Put** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **Post** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **Post** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **Post** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **Delete** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **Get** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **Get** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **Post** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **Post** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **Post** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **Post** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **Delete** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **Get** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **Get** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **Get** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **Put** /user/{username} | Updated user
+
+
+## Documentation For Models
+
+ - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [Animal](docs/Animal.md)
+ - [ApiResponse](docs/ApiResponse.md)
+ - [Apple](docs/Apple.md)
+ - [AppleReq](docs/AppleReq.md)
+ - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
+ - [ArrayTest](docs/ArrayTest.md)
+ - [Banana](docs/Banana.md)
+ - [BananaReq](docs/BananaReq.md)
+ - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
+ - [Category](docs/Category.md)
+ - [ClassModel](docs/ClassModel.md)
+ - [Client](docs/Client.md)
+ - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
+ - [DuplicatedPropChild](docs/DuplicatedPropChild.md)
+ - [DuplicatedPropChildAllOf](docs/DuplicatedPropChildAllOf.md)
+ - [DuplicatedPropParent](docs/DuplicatedPropParent.md)
+ - [EnumArrays](docs/EnumArrays.md)
+ - [EnumClass](docs/EnumClass.md)
+ - [EnumTest](docs/EnumTest.md)
+ - [File](docs/File.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [Foo](docs/Foo.md)
+ - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md)
+ - [FormatTest](docs/FormatTest.md)
+ - [Fruit](docs/Fruit.md)
+ - [FruitReq](docs/FruitReq.md)
+ - [GmFruit](docs/GmFruit.md)
+ - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [HealthCheckResult](docs/HealthCheckResult.md)
+ - [List](docs/List.md)
+ - [Mammal](docs/Mammal.md)
+ - [MapOfFileTest](docs/MapOfFileTest.md)
+ - [MapTest](docs/MapTest.md)
+ - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model200Response](docs/Model200Response.md)
+ - [Name](docs/Name.md)
+ - [NullableAllOf](docs/NullableAllOf.md)
+ - [NullableAllOfChild](docs/NullableAllOfChild.md)
+ - [NullableClass](docs/NullableClass.md)
+ - [NumberOnly](docs/NumberOnly.md)
+ - [OneOfPrimitiveType](docs/OneOfPrimitiveType.md)
+ - [OneOfPrimitiveTypeChild](docs/OneOfPrimitiveTypeChild.md)
+ - [OneOfPrimitiveTypes](docs/OneOfPrimitiveTypes.md)
+ - [OneOfWithNestedPrimitiveTime](docs/OneOfWithNestedPrimitiveTime.md)
+ - [OneOfWithNestedPrimitiveTimeAvatar](docs/OneOfWithNestedPrimitiveTimeAvatar.md)
+ - [Order](docs/Order.md)
+ - [OuterComposite](docs/OuterComposite.md)
+ - [OuterEnum](docs/OuterEnum.md)
+ - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
+ - [OuterEnumInteger](docs/OuterEnumInteger.md)
+ - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [Pet](docs/Pet.md)
+ - [PrimitiveAndPrimitiveTime](docs/PrimitiveAndPrimitiveTime.md)
+ - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [ReadOnlyWithDefault](docs/ReadOnlyWithDefault.md)
+ - [Return](docs/Return.md)
+ - [SpecialModelName](docs/SpecialModelName.md)
+ - [Tag](docs/Tag.md)
+ - [User](docs/User.md)
+ - [Whale](docs/Whale.md)
+ - [Zebra](docs/Zebra.md)
+
+
+## Documentation For Authorization
+
+
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+Note, each API key must be added to a map of `map[string]APIKey` where the key is: api_key and passed in as the auth context for each request.
+
+
+### api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+Note, each API key must be added to a map of `map[string]APIKey` where the key is: api_key_query and passed in as the auth context for each request.
+
+
+### bearer_test
+
+- **Type**: HTTP Bearer token authentication
+
+Example
+
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARER_TOKEN_STRING")
+r, err := client.Service.Operation(auth, args)
 ```
 
-#### Development in docker
 
-You can use `run-in-docker.sh` to do all development. This script maps your local repository to `/gen`
-in the docker container. It also maps `~/.m2/repository` to the appropriate container location.
+### http_basic_test
 
-To execute `mvn package`:
+- **Type**: HTTP basic authentication
 
-```sh
-git clone https://github.com/openapitools/openapi-generator
-cd openapi-generator
-./run-in-docker.sh mvn package
-```
+Example
 
-Build artifacts are now accessible in your working directory.
-
-Once built, `run-in-docker.sh` will act as an executable for openapi-generator-cli. To generate code, you'll need to output to a directory under `/gen` (e.g. `/gen/out`). For example:
-
-```sh
-./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
-./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
-./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
-./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-    -g go -o /gen/out/go-petstore -p packageName=petstore # generates go client, outputs locally to ./out/go-petstore
+```golang
+auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
+    UserName: "username",
+    Password: "password",
+})
+r, err := client.Service.Operation(auth, args)
 ```
 
-##### Troubleshooting
-
-If an error like this occurs, just execute the **mvn clean install -U** command:
 
-> org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project openapi-generator: A type incompatibility occurred while executing org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test: java.lang.ExceptionInInitializerError cannot be cast to java.io.IOException
+### http_signature_test
 
-```sh
-./run-in-docker.sh mvn clean install -U
-```
+- **Type**: HTTP signature authentication
 
-> Failed to execute goal org.fortasoft:gradle-maven-plugin:1.0.8:invoke (default) on project openapi-generator-gradle-plugin-mvn-wrapper: org.gradle.tooling.BuildException: Could not execute build using Gradle distribution 'https://services.gradle.org/distributions/gradle-4.7-bin.zip'
+Example
 
-Right now: no solution for this one :|
+```golang
+	authConfig := client.HttpSignatureAuth{
+		KeyId:                "my-key-id",
+		PrivateKeyPath:       "rsa.pem",
+		Passphrase:           "my-passphrase",
+		SigningScheme:        sw.HttpSigningSchemeHs2019,
+		SignedHeaders:        []string{
+			sw.HttpSignatureParameterRequestTarget, // The special (request-target) parameter expresses the HTTP request target.
+			sw.HttpSignatureParameterCreated,       // Time when request was signed, formatted as a Unix timestamp integer value.
+			"Host",                                 // The Host request header specifies the domain name of the server, and optionally the TCP port number.
+			"Date",                                 // The date and time at which the message was originated.
+			"Content-Type",                         // The Media type of the body of the request.
+			"Digest",                               // A cryptographic digest of the request body.
+		},
+		SigningAlgorithm:     sw.HttpSigningAlgorithmRsaPSS,
+		SignatureMaxValidity: 5 * time.Minute,
+	}
+	var authCtx context.Context
+	var err error
+	if authCtx, err = authConfig.ContextWithValue(context.Background()); err != nil {
+		// Process error
+	}
+	r, err = client.Service.Operation(auth, args)
 
-#### Run Docker in Vagrant
-Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
- ```sh
-git clone https://github.com/openapitools/openapi-generator.git
-cd openapi-generator
-vagrant up
-vagrant ssh
-cd /vagrant
-./run-in-docker.sh mvn package
 ```
 
-### [1.7 - NPM](#table-of-contents)
-
-There is also an [NPM package wrapper](https://www.npmjs.com/package/@openapitools/openapi-generator-cli) available for different platforms (e.g. Linux, Mac, Windows). (JVM is still required)
-Please see the [project's README](https://github.com/openapitools/openapi-generator-cli) there for more information.
+### petstore_auth
 
-Install it globally to get the CLI available on the command line:
 
-```sh
-npm install @openapitools/openapi-generator-cli -g
-openapi-generator-cli version
-```
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+ - **write:pets**: modify pets in your account
+ - **read:pets**: read your pets
 
-<!-- RELEASE_VERSION -->
-To use a specific version of "openapi-generator-cli"
+Example
 
-```sh
-openapi-generator-cli version-manager set 6.2.1
+```golang
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
+r, err := client.Service.Operation(auth, args)
 ```
 
-Or install it as dev-dependency:
+Or via OAuth2 module to automatically refresh tokens and perform user authentication.
 
-```sh
-npm install @openapitools/openapi-generator-cli -D
-```
-<!-- /RELEASE_VERSION -->
-## [2 - Getting Started](#table-of-contents)
-
-To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml), please run the following
-```sh
-git clone https://github.com/openapitools/openapi-generator
-cd openapi-generator
-mvn clean package
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-   -g php \
-   -o /var/tmp/php_api_client
-```
-(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
-
-<!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar)
-<!-- /RELEASE_VERSION -->
-
-To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
-
-To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar config-help -g php`
-
-## [3 - Usage](#table-of-contents)
+```golang
+import "golang.org/x/oauth2"
 
-### To generate a sample client library
-You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) as follows:
+/* Perform OAuth2 round trip request and obtain a token */
 
-```sh
-./bin/generate-samples.sh ./bin/configs/java-okhttp-gson.yaml
+tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
+auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
+r, err := client.Service.Operation(auth, args)
 ```
 
-(On Windows, please install [GIT Bash for Windows](https://gitforwindows.org/) to run the command above)
 
-This script uses the default library, which is `okhttp-gson`. It will run the generator with this command:
+## Documentation for Utility Methods
 
-```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
-  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-  -g java \
-  -t modules/openapi-generator/src/main/resources/Java \
-  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp:true \
-  -o samples/client/petstore/java/okhttp-gson
-```
-
-with a number of options. [The java options are documented here.](docs/generators/java.md)
-
-You can also get the options with the `help generate` command (below only shows partial results):
+Due to the fact that model structure members are all pointers, this package contains
+a number of utility functions to easily obtain pointers to values of basic types.
+Each of these functions takes a value of the given basic type and returns a pointer to it:
 
-```
-NAME
-        openapi-generator-cli generate - Generate code with the specified
-        generator.
-
-SYNOPSIS
-        openapi-generator-cli generate
-                [(-a <authorization> | --auth <authorization>)]
-                [--api-name-suffix <api name suffix>] [--api-package <api package>]
-                [--artifact-id <artifact id>] [--artifact-version <artifact version>]
-                [(-c <configuration file> | --config <configuration file>)] [--dry-run]
-                [(-e <templating engine> | --engine <templating engine>)]
-                [--enable-post-process-file]
-                [(-g <generator name> | --generator-name <generator name>)]
-                [--generate-alias-as-model] [--git-host <git host>]
-                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
-                [--global-property <global properties>...] [--group-id <group id>]
-                [--http-user-agent <http user agent>]
-                [(-i <spec file> | --input-spec <spec file>)]
-                [--ignore-file-override <ignore file override location>]
-                [--import-mappings <import mappings>...]
-                [--instantiation-types <instantiation types>...]
-                [--invoker-package <invoker package>]
-                [--language-specific-primitives <language specific primitives>...]
-                [--legacy-discriminator-behavior] [--library <library>]
-                [--log-to-stderr] [--minimal-update]
-                [--model-name-prefix <model name prefix>]
-                [--model-name-suffix <model name suffix>]
-                [--model-package <model package>]
-                [(-o <output directory> | --output <output directory>)] [(-p <additional properties> | --additional-properties <additional properties>)...]
-                [--package-name <package name>] [--release-note <release note>]
-                [--remove-operation-id-prefix]
-                [--reserved-words-mappings <reserved word mappings>...]
-                [(-s | --skip-overwrite)] [--server-variables <server variables>...]
-                [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
-                [(-t <template directory> | --template-dir <template directory>)]
-                [--type-mappings <type mappings>...] [(-v | --verbose)]
-
-OPTIONS
-        -a <authorization>, --auth <authorization>
-            adds authorization headers when fetching the OpenAPI definitions
-            remotely. Pass in a URL-encoded string of name:header with a comma
-            separating multiple values
-
-...... (results omitted)
-
-        -v, --verbose
-            verbose mode
+* `PtrBool`
+* `PtrInt`
+* `PtrInt32`
+* `PtrInt64`
+* `PtrFloat`
+* `PtrFloat32`
+* `PtrFloat64`
+* `PtrString`
+* `PtrTime`
 
-```
+## Author
 
-You can then compile and run the client, as well as unit tests against it:
 
-```sh
-cd samples/client/petstore/java/okhttp-gson
-mvn package
-```
 
-Other generators have [samples](https://github.com/OpenAPITools/openapi-generator/tree/master/samples) too.
-
-### [3.1 - Customization](#table-of-contents)
-
-Please refer to [customization.md](docs/customization.md) on how to customize the output (e.g. package name, version)
-
-### [3.2 - Workflow Integration (Maven, Gradle, Github, CI/CD)](#table-of-contents)
-
-Please refer to [integration.md](docs/integration.md) on how to integrate OpenAPI generator with Maven, Gradle, sbt, Bazel, Github and CI/CD.
-
-### [3.3 - Online OpenAPI generator](#table-of-contents)
-
-Here are the public online services:
-
-- latest stable version: https://api.openapi-generator.tech
-- latest master: https://api-latest-master.openapi-generator.tech (updated with latest master every hour)
-
-The server is sponsored by [Linode](https://www.linode.com/) [![Linode Logo](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/)
-
-(These services are beta and do not have any guarantee on service level)
-
-Please refer to [online.md](docs/online.md) on how to run and use the `openapi-generator-online` - a web service for `openapi-generator`.
-
-### [3.4 - License information on Generated Code](#table-of-contents)
-
-The OpenAPI Generator project is intended as a benefit for users of the Open API Specification.  The project itself has the [License](#license) as specified. In addition, please understand the following points:
-
-* The templates included with this project are subject to the [License](#license).
-* Generated code is intentionally _not_ subject to the parent project license
-
-When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
-
-### [3.5 - IDE Integration](#table-of-contents)
-
-Here is a list of community-contributed IDE plug-ins that integrate with OpenAPI Generator:
-
-- Eclipse: [Codewind OpenAPI Tools for Eclipse](https://www.eclipse.org/codewind/open-api-tools-for-eclipse.html) by [IBM](https://www.ibm.com)
-- IntelliJ IDEA: [OpenAPI Generator](https://plugins.jetbrains.com/plugin/8433-openapi-generator) by [Jim Schubert](https://jimschubert.us/#/)
-- IntelliJ IDEA: [Senya Editor](https://plugins.jetbrains.com/plugin/10690-senya-editor) by [senya.io](https://senya.io)
-- [RepreZen API Studio](https://www.reprezen.com/)
-- Visual Studio: [REST API Client Code Generator](https://marketplace.visualstudio.com/items?itemName=ChristianResmaHelle.ApiClientCodeGenerator) by [Christian Resma Helle](https://christian-helle.blogspot.com/)
-- Visual Studio Code: [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) by [IBM](https://marketplace.visualstudio.com/publishers/IBM)
-
-
-## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
-Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
-
-- [Aalborg University](https://www.aau.dk)
-- [Adaptant Solutions AG](https://www.adaptant.io/)
-- [adesso SE](https://www.adesso.de/)
-- [Adyen](https://www.adyen.com/)
-- [Agoda](https://www.agoda.com/)
-- [Airthings](https://www.airthings.com/)
-- [Allianz](https://www.allianz.com)
-- [Angular.Schule](https://angular.schule/)
-- [Aqovia](https://aqovia.com/)
-- [Australia and New Zealand Banking Group (ANZ)](http://www.anz.com/)
-- [ASKUL](https://www.askul.co.jp)
-- [Arduino](https://www.arduino.cc/)
-- [b<>com](https://b-com.com/en)
-- [百度营销](https://e.baidu.com)
-- [Bandwidth](https://dev.bandwidth.com)
-- [Banzai Cloud](https://banzaicloud.com)
-- [BIMData.io](https://bimdata.io)
-- [Bithost GmbH](https://www.bithost.ch)
-- [Bosch Connected Industry](https://www.bosch-connected-industry.com)
-- [Boxever](https://www.boxever.com/)
-- [Brevy](https://www.brevy.com)
-- [Bunker Holding Group](https://www.bunker-holding.com/)
-- [California State University, Northridge](https://www.csun.edu)
-- [CAM](https://www.cam-inc.co.jp/)
-- [Camptocamp](https://www.camptocamp.com/en)
-- [Cisco](https://www.cisco.com/)
-- [codecentric AG](https://www.codecentric.de/)
-- [CoinAPI](https://www.coinapi.io/)
-- [Commencis](https://www.commencis.com/)
-- [Crossover Health](https://crossoverhealth.com/)
-- [Cupix](https://www.cupix.com/)
-- [Datadog](https://www.datadoghq.com)
-- [DB Systel](https://www.dbsystel.de)
-- [Deeporute.ai](https://www.deeproute.ai/)
-- [Devsupply](https://www.devsupply.com/)
-- [DocSpring](https://docspring.com/)
-- [dwango](https://dwango.co.jp/)
-- [Edge Impulse](https://www.edgeimpulse.com/)
-- [Element AI](https://www.elementai.com/)
-- [Embotics](https://www.embotics.com/)
-- [emineo](https://www.emineo.ch)
-- [fastly](https://www.fastly.com/)
-- [Fenergo](https://www.fenergo.com/)
-- [freee](https://corp.freee.co.jp/en/)
-- [FreshCells](https://www.freshcells.de/)
-- [Fuse](https://www.fuse.no/)
-- [Gantner](https://www.gantner.com)
-- [GenFlow](https://github.com/RepreZen/GenFlow)
-- [GetYourGuide](https://www.getyourguide.com/)
-- [Glovo](https://glovoapp.com/)
-- [GMO Pepabo](https://pepabo.com/en/)
-- [GoDaddy](https://godaddy.com)
-- [Gumtree](https://gumtree.com)
-- [Here](https://developer.here.com/)
-- [IBM](https://www.ibm.com/)
-- [Instana](https://www.instana.com)
-- [Interxion](https://www.interxion.com)
-- [Inquisico](https://inquisico.com)
-- [JustStar](https://www.juststarinfo.com)
-- [k6.io](https://k6.io/)
-- [Klarna](https://www.klarna.com/)
-- [Kronsoft Development](https://www.kronsoft.ro/home/)
-- [Kubernetes](https://kubernetes.io)
-- [Linode](https://www.linode.com/)
-- [Logicdrop](https://www.logicdrop.com)
-- [Lumeris](https://www.lumeris.com)
-- [LVM Versicherungen](https://www.lvm.de)
-- [MailSlurp](https://www.mailslurp.com)
-- [Manticore Search](https://manticoresearch.com)
-- [Mastercard](https://developers.mastercard.com)
-- [Médiavision](https://www.mediavision.fr/)
-- [Metaswitch](https://www.metaswitch.com/)
-- [MoonVision](https://www.moonvision.io/)
-- [Myworkout](https://myworkout.com)
-- [NamSor](https://www.namsor.com/)
-- [Neverfail](https://www.neverfail.com/)
-- [NeuerEnergy](https://neuerenergy.com)
-- [Nokia](https://www.nokia.com/)
-- [OneSignal](https://www.onesignal.com/)
-- [Options Clearing Corporation (OCC)](https://www.theocc.com/)
-- [Openet](https://www.openet.com/)
-- [openVALIDATION](https://openvalidation.io/)
-- [Oracle](https://www.oracle.com/)
-- [Paxos](https://www.paxos.com)
-- [Plaid](https://plaid.com)
-- [PLAID, Inc.](https://plaid.co.jp/)
-- [Ponicode](https://ponicode.dev/)
-- [Pricefx](https://www.pricefx.com/)
-- [PrintNanny](https://www.print-nanny.com/)
-- [Prometheus/Alertmanager](https://github.com/prometheus/alertmanager)
-- [Qavar](https://www.qavar.com)
-- [QEDIT](https://qed-it.com)
-- [Qovery](https://qovery.com)
-- [Qulix Systems](https://www.qulix.com)
-- [Raksul](https://corp.raksul.com)
-- [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
-- [RedHat](https://www.redhat.com)
-- [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
-- [REST United](https://restunited.com)
-- [Robotinfra](https://www.robotinfra.com)
-- [SmartHR](https://smarthr.co.jp/)
-- [Sony Interactive Entertainment](https://www.sie.com/en/index.html)
-- [Splitit](https://www.splitit.com/)
-- [Stingray](http://www.stingray.com)
-- [Suva](https://www.suva.ch/)
-- [Telstra](https://dev.telstra.com)
-- [Tencent](https://www.tencent.com)
-- [The University of Aizu](https://www.u-aizu.ac.jp/en/)
-- [Translucent ApS](https://www.translucent.dk)
-- [TravelTime platform](https://www.traveltimeplatform.com/)
-- [TribalScale](https://www.tribalscale.com)
-- [Trifork](https://trifork.com)
-- [TUI InfoTec GmbH](http://www.tui-infotec.com/)
-- [Twilio](https://www.twilio.com/)
-- [Twitter](https://twitter.com)
-- [unblu inc.](https://www.unblu.com/)
-- [Veamly](https://www.veamly.com/)
-- [VMWare](https://www.vmware.com/)
-- [wbt-solutions](https://www.wbt-solutions.de/)
-- [Woleet](https://www.woleet.io/)
-- [WSO2](https://wso2.com/)
-- [Vouchery.io](https://vouchery.io)
-- [Xero](https://www.xero.com/)
-- [Yahoo Japan](https://www.yahoo.co.jp/)
-- [viadee](https://www.viadee.de/)
-- [Vonage](https://vonage.com)
-- [YITU Technology](https://www.yitutech.com/)
-- [Yelp](https://www.yelp.com/)
-- [Zalando](https://www.zalando.com)
-- [3DS Outscale](https://www.outscale.com/)
-
-## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents)
-
-- 2018/05/12 - [OpenAPI Generator - community drivenで成長するコードジェネレータ](https://ackintosh.github.io/blog/2018/05/12/openapi-generator/) by [中野暁人](https://github.com/ackintosh)
-- 2018/05/15 - [Starting a new open-source project](http://jmini.github.io/blog/2018/2018-05-15_new-open-source-project.html) by [Jeremie Bresson](https://github.com/jmini)
-- 2018/05/15 - [REST API仕様からAPIクライアントやスタブサーバを自動生成する「OpenAPI Generator」オープンソースで公開。Swagger Codegenからのフォーク](https://www.publickey1.jp/blog/18/rest_apiapiopenapi_generatorswagger_generator.html) by [Publickey](https://www.publickey1.jp)
-- 2018/06/08 - [Swagger Codegen is now OpenAPI Generator](https://angular.schule/blog/2018-06-swagger-codegen-is-now-openapi-generator) by [JohannesHoppe](https://github.com/JohannesHoppe)
-- 2018/06/21 - [Connect your JHipster apps to the world of APIs with OpenAPI and gRPC](https://fr.slideshare.net/chbornet/jhipster-conf-2018-connect-your-jhipster-apps-to-the-world-of-apis-with-openapi-and-grpc) by [Christophe Bornet](https://github.com/cbornet) at [JHipster Conf 2018](https://jhipster-conf.github.io/)
-- 2018/06/22 - [OpenAPI Generator で Gatling Client を生成してみた](https://rohki.hatenablog.com/entry/2018/06/22/073000) at [ソモサン](https://rohki.hatenablog.com/)
-- 2018/06/27 - [Lessons Learned from Leading an Open-Source Project Supporting 30+ Programming Languages](https://speakerdeck.com/wing328/lessons-learned-from-leading-an-open-source-project-supporting-30-plus-programming-languages) - [William Cheng](https://github.com/wing328) at [LinuxCon + ContainerCon + CloudOpen China 2018](http://bit.ly/2waDKKX)
-- 2018/07/19 - [OpenAPI Generator Contribution Quickstart - RingCentral Go SDK](https://medium.com/ringcentral-developers/openapi-generator-for-go-contribution-quickstart-8cc72bf37b53) by [John Wang](https://github.com/grokify)
-- 2018/08/22 - [OpenAPI Generatorのプロジェクト構成などのメモ](https://yinm.info/20180822/) by [Yusuke Iinuma](https://github.com/yinm)
-- 2018/09/12 - [RepreZen and OpenAPI 3.0: Now is the Time](https://www.reprezen.com/blog/reprezen-openapi-3.0-upgrade-now-is-the-time) by [Miles Daffin](https://www.reprezen.com/blog/author/miles-daffin)
-- 2018/10/31 - [A node package wrapper for openapi-generator](https://github.com/HarmoWatch/openapi-generator-cli)
-- 2018/11/03 - [OpenAPI Generator + golang + Flutter でアプリ開発](http://ryuichi111std.hatenablog.com/entry/2018/11/03/214005) by [Ryuichi Daigo](https://github.com/ryuichi111)
-- 2018/11/15 - [基于openapi3.0的yaml文件生成java代码的一次实践](https://blog.csdn.net/yzy199391/article/details/84023982) by [焱魔王](https://me.csdn.net/yzy199391)
-- 2018/11/18 - [Generating PHP library code from OpenAPI](https://lornajane.net/posts/2018/generating-php-library-code-from-openapi) by [Lorna Jane](https://lornajane.net/) at [LORNAJANE Blog](https://lornajane.net/blog)
-- 2018/11/19 - [OpenAPIs are everywhere](https://youtu.be/-lDot4Yn7Dg) by [Jeremie Bresson (Unblu)](https://github.com/jmini) at [EclipseCon Europe 2018](https://www.eclipsecon.org/europe2018)
-- 2018/12/09 - [openapi-generator をカスタマイズする方法](https://qiita.com/watiko/items/0961287c02eac9211572) by [@watiko](https://qiita.com/watiko)
-- 2019/01/03 - [Calling a Swagger service from Apex using openapi-generator](https://lekkimworld.com/2019/01/03/calling-a-swagger-service-from-apex-using-openapi-generator/) by [Mikkel Flindt Heisterberg](https://lekkimworld.com)
-- 2019/01/13 - [OpenAPI GeneratorでRESTful APIの定義書から色々自動生成する](https://ky-yk-d.hatenablog.com/entry/2019/01/13/234108) by [@ky_yk_d](https://twitter.com/ky_yk_d)
-- 2019/01/20 - [Contract-First API Development with OpenAPI Generator and Connexion](https://medium.com/commencis/contract-first-api-development-with-openapi-generator-and-connexion-b21bbf2f9244) by [Anil Can Aydin](https://github.com/anlcnydn)
-- 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)
-- 2019/02/02 - [平静を保ち、コードを生成せよ 〜 OpenAPI Generator誕生の背景と軌跡 〜](https://speakerdeck.com/akihito_nakano/gunmaweb34) by [中野暁人](https://github.com/ackintosh) at [Gunma.web #34 スキーマ駆動開発](https://gunmaweb.connpass.com/event/113974/)
-- 2019/02/20 - [An adventure in OpenAPI V3 code generation](https://mux.com/blog/an-adventure-in-openapi-v3-api-code-generation/) by [Phil Cluff](https://mux.com/blog/author/philc/)
-- 2019/02/26 - [Building API Services: A Beginner’s Guide](https://medium.com/google-cloud/building-api-services-a-beginners-guide-7274ae4c547f) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platform Blog](https://medium.com/google-cloud)
-- 2019/02/26 - [Building APIs with OpenAPI: Continued](https://medium.com/@ratrosy/building-apis-with-openapi-continued-5d0faaed32eb) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platform Blog](https://medium.com/google-cloud)
-- 2019-03-07 - [OpenAPI Generator で Spring Boot と Angular をタイプセーフに繋ぐ](https://qiita.com/chibato/items/e4a748db12409b40c02f) by [Tomofumi Chiba](https://github.com/chibat)
-- 2019-03-16 - [A Quick introduction to manual OpenAPI V3](https://vadosware.io/post/quick-intro-to-manual-openapi-v3/) by [vados](https://github.com/t3hmrman) at [VADOSWARE](https://vadosware.io)
-- 2019-03-25 - [Access any REST service with the SAP S/4HANA Cloud SDK](https://blogs.sap.com/2019/03/25/integrate-sap-s4hana-cloud-sdk-with-open-api/) by [Alexander Duemont](https://people.sap.com/alexander.duemont)
-- 2019-03-25 - [OpenAPI generatorを試してみる](https://qiita.com/amuyikam/items/e8a45daae59c68be0fc8) by [@amuyikam](https://twitter.com/amuyikam)
-- 2019-03-27 - [OpenAPI3を使ってみよう!Go言語でクライアントとスタブの自動生成まで!](https://techblog.zozo.com/entry/openapi3/go) by [@gold_kou](https://twitter.com/gold_kou)
-- 2019-04-17 - [OpenAPIによるスキーマファースト開発の実施サンプルとCloud Runについて](https://tech-blog.optim.co.jp/entry/2019/04/17/174000) by [@yukey1031](https://twitter.com/yukey1031)
-- 2019-04-18 - [How to use OpenAPI3 for API developer (RubyKaigi 2019)](https://speakerdeck.com/ota42y/how-to-use-openapi3-for-api-developer) by [@ota42y](https://twitter.com/ota42y) at [RubyKaigi 2019](https://rubykaigi.org/2019)
-- 2019-04-29 - [A Beginner's Guide to Code Generation for REST APIs (OpenAPI Generator)](https://gum.co/openapi_generator_ebook) by [William Cheng](https://twitter.com/wing328)
-- 2019-05-01 - [Design and generate a REST API from Swagger / OpenAPI in Java, Python, C# and more](https://simply-how.com/design-and-generate-api-code-from-openapi) by [Simply How](https://simply-how.com/)
-- 2019-05-17 - [Generate Spring Boot REST API using Swagger/OpenAPI](https://www.47northlabs.com/knowledge-base/generate-spring-boot-rest-api-using-swagger-openapi/) by [Antonie Zafirov](https://www.47northlabs.com/author/antonie-zafirov/)
-- 2019-05-22 - [REST APIs代码生成指南(OpenAPI Generator)](https://gum.co/openapi_generator_ebook_gb) by [William Cheng](https://twitter.com/wing328), [Xin Meng](https://github.com/xmeng1)
-- 2019-05-24 - [REST API 代碼生成指南 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328)
-- 2019-06-24 - [Kubernetes Clients and OpenAPI Generator](https://speakerdeck.com/wing328/kubernetes-clients-and-openapi-generator) by [William Cheng](https://twitter.com/wing328) at [Kubernetes Contributor Summits Shanghai 2019](https://www.lfasiallc.com/events/contributors-summit-china-2019/)
-- 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
-- 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
-- 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
-- 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
-- 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
-- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community](https://speakerdeck.com/wing328/developer-experience-dx-for-open-source-projects-english-japanese) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
-- 2019-08-14 - [Our OpenAPI journey with Standardizing SDKs](https://bitmovin.com/our-openapi-journey-with-standardizing-sdks/) by [Sebastian Burgstaller](https://bitmovin.com/author/sburgstaller/) at [Bitmovin](https://www.bitmovin.com)
-- 2019-08-15 - [APIのコードを自動生成させたいだけならgRPCでなくてもよくない?](https://www.m3tech.blog/entry/2019/08/15/110000) by [M3, Inc.](https://corporate.m3.com/)
-- 2019-08-22 - [マイクロサービスにおけるWeb APIスキーマの管理─ GraphQL、gRPC、OpenAPIの特徴と使いどころ](https://employment.en-japan.com/engineerhub/entry/2019/08/22/103000) by [@ota42y](https://twitter.com/ota42y)
-- 2019-08-24 - [SwaggerドキュメントからOpenAPI Generatorを使ってモックサーバー作成](https://qiita.com/masayoshi0222/items/4845e4c715d04587c104) by [坂本正義](https://qiita.com/masayoshi0222)
-- 2019-08-29 - [OpenAPI初探](https://cloud.tencent.com/developer/article/1495986) by [peakxie](https://cloud.tencent.com/developer/user/1113152) at [腾讯云社区](https://cloud.tencent.com/developer)
-- 2019-08-29 - [全面进化:Kubernetes CRD 1.16 GA前瞻](https://www.servicemesher.com/blog/kubernetes-1.16-crd-ga-preview/) by [Min Kim](https://github.com/yue9944882) at [ServiceMesher Blog](https://www.servicemesher.com/blog/)
-- 2019-09-01 - [Creating a PHP-Slim server using OpenAPI (Youtube video)](https://www.youtube.com/watch?v=5cJtbIrsYkg) by [Daniel Persson](https://www.youtube.com/channel/UCnG-TN23lswO6QbvWhMtxpA)
-- 2019-09-06 - [Vert.x and OpenAPI](https://wissel.net/blog/2019/09/vertx-and-openapi.html) by [Stephan H Wissel](https://twitter.com/notessensei) at [wissel.net blog](https://wissel.net)
-- 2019-09-09 - [Cloud-native development - Creating RESTful microservices](https://cloud.ibm.com/docs/cloud-native?topic=cloud-native-rest-api) in [IBM Cloud Docs](https://cloud.ibm.com/docs)
-- 2019-09-14 - [Generating and Configuring a Mastercard API Client](https://developer.mastercard.com/platform/documentation/generating-and-configuring-a-mastercard-api-client/) at [Mastercard Developers Platform](https://developer.mastercard.com/platform/documentation/)
-- 2019-09-15 - [OpenAPI(Swagger)導入下調べ](https://qiita.com/ShoichiKuraoka/items/f1f7a3c2376f7cd9c56a) by [Shoichi Kuraoka](https://qiita.com/ShoichiKuraoka)
-- 2019-09-17 - [Tutorial: Documenting http4k APIs with OpenApi3](https://www.http4k.org/tutorials/documenting_apis_with_openapi/) by [http4k](https://www.http4k.org/)
-- 2019-09-22 - [OpenAPI 3を完全に理解できる本](https://booth.pm/ja/items/1571902) by [@ota42y](https://twitter.com/ota42y)
-- 2019-09-22 - [RESTful APIs: Tutorial of OpenAPI Specification](https://medium.com/@amirm.lavasani/restful-apis-tutorial-of-openapi-specification-eeada0e3901d) by [Amir Lavasani](https://medium.com/@amirm.lavasani)
-- 2019-09-22 - [Redefining SDKs as software diversity kits](https://devrel.net/dev-rel/redefining-sdks-as-software-diversity-kits) by [Sid Maestre (Xero)](https://twitter.com/sidneyallen) at [DevRelCon San Francisco 2019](https://sf2019.devrel.net/)
-- 2019-09-23 - [swaggerからOpenApi GeneratorでSpringのコードを自動生成](https://qiita.com/littleFeet/items/492df2ad68a0799a5e5e) by [@littleFeet](https://qiita.com/littleFeet) at [Qiita](https://qiita.com/)
-- 2019-09-24 - [Eine Stunde was mit Api First!](https://www.slideshare.net/JanWeinschenker/eine-stunde-was-mit-api-first) by [@janweinschenker](https://twitter.com/janweinschenker) at [Java Forum Nord](https://javaforumnord.de/)
-- 2019-10-09 - [openapi-generator で生成した Go クライアントで Bearer 認証をする](https://autopp-tech.hatenablog.com/entry/2019/10/09/222039) by [Akira Tanimura](https://github.com/autopp)
-- 2019-10-10 - [Automatic Generation of REST Clients](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/) by Thomas Peyrard, Senior Software Engineer at Criteo in [Full-Stack Tech Talks (Meetup)](https://www.meetup.com/fr-FR/Criteo-Labs-Tech-Talks/events/264775768/)
-- 2019-10-12 - [OpenApi自动生成client](https://blog.csdn.net/wxid2798226/article/details/102527467) by [郑泽洲](https://me.csdn.net/wxid2798226)
-- 2019-10-16 - [How to ship APIs faster?](https://medium.com/@accounts_76224/how-to-ship-apis-faster-cabef2f819e4) by [Simon Guilliams @ PoniCode](https://ponicode.dev)
-- 2019-10-22 - [OpenAPI + Spring Boot(Kotlin)でファイルダウンロードAPIを作成する](https://qiita.com/boronngo/items/4b78b92526209daeaee9) by [Yuki Furukawa](https://twitter.com/yuki_furukawa5)
-- 2019-10-24 - [Microprofile OpenAPI - Code First or Design First?](https://github.com/pe-st/apidocs/blob/master/MicroProfile-OpenAPI-all-slides.pdf) by [Peter [pɛʃə] Steiner](https://twitter.com/pesche) at [eclipsecon Europe 2019](https://www.eclipsecon.org/europe2019/sessions/microprofile-openapi-code-first-or-design-first)
-- 2019-11-06 - [Generating API clients based on OpenAPI v3 specifications](https://98elements.com/blog/generating-api-clients-based-on-openapi-v3-specifications) by [Dominik Jastrzębski @ 98elements](https://98elements.com)
-- 2019-11-06 - [OpenAPIを利用して自前のAPIサーバー(Sinatra)を移植した時のメモ](https://qiita.com/YasuhiroABE/items/c73920eab2d9d6e97fd9) by [Yasuhiro ABE](https://twitter.com/YasuhiroABE)
-- 2019-11-07 - [API First development with OpenAPI - You should you practise it !?](https://www.youtube.com/watch?v=F9iF3a1Z8Y8) by [Nick Van Hoof](https://www.nickvanhoof.com/) at [Devoxx Belgium 2019](https://devoxx.be/)
-- 2019-11-08 - [JHipster beyond CRUD - API-First for Enterprises by Enrico Costanzi](https://www.youtube.com/watch?v=m28JFovKQ20) by [Enrico Costanzi](https://twitter.com/enricocostanzi) at [JHipster Conf 2019 in Paris](https://jhipster-conf.github.io/)
-- 2019-11-11 - [TypeScript REST APIクライアント](https://qiita.com/unhurried/items/7b74f7d3c43545dadd2b) by [@unhurried](https://qiita.com/unhurried)
-- 2019-11-11 - [One Spec to Rule them all - OpenAPI in Action](https://www.youtube.com/watch?v=MMay_nht8ec) by [Andreas Litt](https://github.com/littldr) at [code.talks 2019](https://www.codetalks.com/)
-- 2019-11-13 - [OpenAPI 3.0 Editor And Generator With A Spring Boot Example](https://simply-how.com/design-and-generate-api-code-from-openapi) at [Simply How](https://simply-how.com/)
-- 2019-11-17 - [OpenAPI Generator YouTube playlist](https://www.youtube.com/playlist?list=PLtJyHVMdzfF6fBkOUV5VDVErP23CGgHIy) at [YouTube](https://www.youtube.com)
-- 2019-11-20 - [Introduction to OpenAPI](https://noti.st/lornajane/HvDH7U/introduction-to-openapi) by [Lorna Mitchell](https://twitter.com/lornajane) at [GOTO Copenhagen 2019](https://gotocph.com/2019/)
-- 2019-11-20 - [How to Generate Angular code from OpenAPI specifications](https://dotnetthoughts.net/how-to-generate-angular-code-from-openapi-specifications/) by Anuraj
-- 2019-11-23 - [Swagger ではない OpenAPI Specification 3.0 による API サーバー開発](https://www.slideshare.net/techblogyahoo/swagger-openapi-specification-30-api) by [Tetsuya Morimoto](https://github.com/t2y) at [JJUG CCC 2019 Fall](https://ccc2019fall.java-users.jp/)
-- 2019-11-24 - [Accelerate Flutter development with OpenAPI and Dart code generation](https://medium.com/@irinasouthwell_220/accelerate-flutter-development-with-openapi-and-dart-code-generation-1f16f8329a6a) by [Irina Southwell](https://medium.com/@irinasouthwell_220)
-- 2019-11-25 - [openapi-generatorで手軽にスタブサーバとクライアントの生成](https://qiita.com/pochopocho13/items/8db662e1934fb2b408b8) by [@pochopocho13](https://twitter.com/pochopocho13)
-- 2019-11-26 - [CordaCon 2019 Highlights: Braid Server and OpenAPI Generator for Corda Client API’s](https://blog.b9lab.com/cordacon-2019-highlights-braid-server-and-openapi-generator-for-corda-flows-api-s-d24179ccb27c) by [Adel Rustum](https://blog.b9lab.com/@adelrestom) at [B9lab](https://blog.b9lab.com/)
-- 2019-12-03 - [A Road to Less Coding: Auto-Generate APILibrary](https://www.corda.net/blog/a-road-to-less-coding-auto-generate-apilibrary/) at [Corda Blog](https://www.corda.net/blog/)
-- 2019-12-04 - [Angular+NestJS+OpenAPI(Swagger)でマイクロサービスを視野に入れた環境を考える](https://qiita.com/teracy55/items/0327c7a170ec772970c6) by [てらしー](https://twitter.com/teracy55)
-- 2019-12-05 - [Code generation on the Java VM](https://speakerdeck.com/sullis/code-generation-on-the-java-vm-2019-12-05) by [Sean Sullivan](https://speakerdeck.com/sullis)
-- 2019-12-17 - [OpenAPI Generator で OAuth2 アクセストークン発行のコードまで生成してみる](https://www.techscore.com/blog/2019/12/17/openapi-generator-oauth2-accesstoken/) by [TECHSCORE](https://www.techscore.com/blog/)
-- 2019-12-23 - [Use Ada for Your Web Development](https://www.electronicdesign.com/technologies/embedded-revolution/article/21119177/use-ada-for-your-web-development) by [Stephane Carrez](https://github.com/stcarrez)
-- 2019-12-23 - [OpenAPIのスキーマを分割・構造化していく方法](https://gift-tech.co.jp/articles/structured-openapi-schema) by [小飯塚達也](https://github.com/t2h5) at [GiFT, Inc](https://gift-tech.co.jp/)
-- 2020-01-17 - [OpenAPI demo for Pulp 3.0 GA](https://www.youtube.com/watch?v=mFBP-M0ZPfw&t=178s) by [Pulp](https://www.youtube.com/channel/UCI43Ffs4VPDv7awXvvBJfRQ) at [Youtube](https://www.youtube.com/)
-- 2020-01-19 - [Why document a REST API as code?](https://dev.to/rolfstreefkerk/why-document-a-rest-api-as-code-5e7p) by [Rolf Streefkerk](https://github.com/rpstreef) at [DEV Community](https://dev.to)
-- 2020-01-28 - [Get Your Serverless Swagger Back with OpenAPI](https://dev.to/matttyler/get-your-serverless-swagger-back-with-openapi-48gc) by [Matt Tyler](https://dev.to/matttyler)
-- 2020-01-30 - [OpenAPI Generatorへのコントリビュート](https://www.yutaka0m.work/entry/2020/01/30/163905) by [yutaka0m](https://github.com/yutaka0m)
-- 2020-02-01 - [Using OpenAPI to Maximise Your Pulp 3 Experience](https://fosdem.org/2020/schedule/event/openapi/) by [Dennis Kliban](https://github.com/dkliban/) at [FOSDEM](https://fosdem.org/)
-- 2020-02-07 - [Why you should use OpenAPI for your API design](https://www.youtube.com/watch?v=zhb7vUApLW8&t=927s) by [Nick Van Hoof](https://apiconference.net/speaker/nick-van-hoof/) at [API Conference](https://apiconference.net/)
-- 2020-02-17 - [Rubynetes: using OpenAPI to validate Kubernetes configs](https://www.brightbox.com/blog/2020/02/17/using-openapi-to-validate-kubernetes-configs/) by Neil Wilson at [Brightbox](https://www.brightbox.com/)
-- 2020-02-20 - [Building SDKs for the future](https://devblog.xero.com/building-sdks-for-the-future-b79ff726dfd6) by [Sid Maestre (Xero)](https://twitter.com/sidneyallen)
-- 2020-02-27 - [Nuxt利用プロダクトでIE11と仲良くするためのE2E](https://tech.medpeer.co.jp/entry/e2e-ie11) at [Medpeer.co.jp Tech Blog](https://tech.medpeer.co.jp/)
-- 2020-02-29 - [Providing Support to IoT Devices Deployed in Disconnected Rural Environment (Conference paper)](https://link.springer.com/chapter/10.1007/978-3-030-41494-8_14) by Sergio Laso, Daniel Flores-Martín, Juan Luis HerreraCarlos, CanalJuan Manuel, MurilloJavier Berrocal
-- 2020-03-02 - [How To Generate Angular & Spring Code From OpenAPI Specification](https://www.mokkapps.de/blog/how-to-generate-angular-and-spring-code-from-open-api-specification/) by [Michael Hoffmann](https://www.mokkapps.de/)
-- 2020-03-02 - [OpenAPI Generator + TypeScript で始める自動生成の型に守られた豊かなクライアント生活](https://gift-tech.co.jp/articles/openapi-generator-typescript) by [五百蔵 直樹](https://gift-tech.co.jp/members/naokiioroi) at [GiFT株式会社](https://gift-tech.co.jp/)
-- 2020-03-10 - [OpenAPI Generator Meetup #1](https://speakerdeck.com/akihito_nakano/openapi-generator-meetup-number-1) by [中野暁人](https://github.com/ackintosh) at [OpenAPI Generator Meetup #1](https://openapi-generator-meetup.connpass.com/event/168187/)
-- 2020-03-15 - [Load Testing Your API with Swagger/OpenAPI and k6](https://k6.io/blog/load-testing-your-api-with-swagger-openapi-and-k6)
-- 2020-04-13 - [俺的【OAS】との向き合い方 (爆速でOpenAPIと友達になろう)](https://tech-blog.optim.co.jp/entry/2020/04/13/100000) in [OPTim Blog](https://tech-blog.optim.co.jp/)
-- 2020-04-22 - [Introduction to OpenAPI Generator](https://nordicapis.com/introduction-to-openapi-generator/) by [Kristopher Sandoval](https://nordicapis.com/author/sandovaleffect/) in [Nordic APIs](https://nordicapis.com/)
-- 2020-04-27 - [How we use Open API v3 specification to auto-generate API documentation, code-snippets and clients](https://medium.com/pdf-generator-api/how-we-use-open-api-v3-specification-to-auto-generate-api-documentation-code-snippets-and-clients-d127a3cea784) by [Tanel Tähepõld](https://medium.com/@tanel.tahepold)
-- 2020-05-09 - [OpenAPIでお手軽にモックAPIサーバーを動かす](https://qiita.com/kasa_le/items/97ca6a8dd4605695c25c) by [Sachie Kamba](https://qiita.com/kasa_le)
-- 2020-05-18 - [Spring Boot REST with OpenAPI 3](https://dev.to/alfonzjanfrithz/spring-boot-rest-with-openapi-3-59jm) by [Alfonz Jan Frithz](https://dev.to/alfonzjanfrithz)
-- 2020-05-19 - [Dead Simple APIs with Open API](https://www.youtube.com/watch?v=sIaXmR6xRAw) by [Chris Tankersley](https://github.com/dragonmantank) at [Nexmo](https://developer.nexmo.com/)
-- 2020-05-22 - [TypeScript REST API Client](https://dev.to/unhurried/typescript-rest-api-client-4in3) by ["unhurried"](https://dev.to/unhurried)
-- 2020-05-28 - [【使用 lotify + Swagger 建置可共用的 LINE Notify bot】 - #NiJia @ Chatbot Developer Taiwan 第 #19 小聚](https://www.youtube.com/watch?v=agYVz6dzh1I) by [Chatbot Developer Taiwan](https://www.youtube.com/channel/UCxeYUyZNnHmpX23YNF-ewvw)
-- 2020-05-28 - [Building APIs with Laravel using OpenAPI](https://www.youtube.com/watch?v=xexLvQqAhiA) by [Chris Tankersley](https://github.com/dragonmantank) at [Laracon EU](https://laracon.eu/)
-- 2020-06-12 - [Interoperability by construction: code generation for Arrowhead Clients](https://ieeexplore.ieee.org/document/9274746) by Michele Albano, Brian Nielsen at [2020 IEEE Conference on Industrial Cyberphysical Systems (ICPS)](https://ieeexplore.ieee.org/xpl/conhome/9274544/proceeding)
-- 2020-06-23 - [新規サーバーアプリケーションにTypeScriptを採用してみた](https://www.cam-inc.co.jp/news/20200623) at [CAM Tech Blog](https://www.cam-inc.co.jp/news/tech-blog/)
-- 2020-06-29 - [Artifact Abstract: Deployment of APIs on Android Mobile Devices and Microcontrollers](https://ieeexplore.ieee.org/document/9127353) by [Sergio Laso ; Marino Linaje ; Jose Garcia-Alonso ; Juan M. Murillo ; Javier Berrocal](https://ieeexplore.ieee.org/document/9127353/authors#authors) at [2020 IEEE International Conference on Pervasive Computing and Communications (PerCom)](https://ieeexplore.ieee.org/xpl/conhome/9125449/proceeding)
-- 2020-07-07 - [5 Best API Documentation Tools](https://blog.dreamfactory.com/5-best-api-documentation-tools/) by Susanna Bouse at [DreamFactory Blog](https://blog.dreamfactory.com/)
-- 2020-07-12 - [Open API 3.0の定義からgolangのサーバコードのスケルトンを作成する](https://qiita.com/professor/items/4cbd04ec084d13057bc2) by [@professor (Qiita Blog)](https://qiita.com/professor)
-- 2020-07-20 - [Datadog API client libraries now available for Java and Go](https://www.datadoghq.com/blog/java-go-libraries/) by Jordan Obey at [Datadog Blog](https://www.datadoghq.com/blog)
-- 2020-07-23 - [Generate Client SDK for .NET Core using Open Api](https://dev.to/no0law1/generate-client-sdk-for-net-core-using-open-api-2dgh) by [Nuno Reis](https://dev.to/no0law1)
-- 2020-07-26 - [Dartのhttp_interceptorライブラリを使うと配列のクエリパラメータが消えてしまう件の応急処置](https://qiita.com/gyamoto/items/eeeff81b6770487319ed) by [@gyamoto](https://qiita.com/gyamoto)
-- 2020-08-01 - [Generate Angular ReactiveForms from Swagger/OpenAPI](https://dev.to/martinmcwhorter/generate-angular-reactiveforms-from-swagger-openapi-35h9) by [Martin McWhorter](https://dev.to/martinmcwhorter)
-- 2020-08-03 - [Criando Bibliotecas para APIs RESTful com OpenAPI, Swagger Editor e OpenAPI Generator](https://medium.com/@everisBrasil/criando-bibliotecas-para-apis-restful-com-openapi-swagger-editor-e-openapi-generator-75349a6420fd) by [everis Brasil (an NTT DATA Company)](https://medium.com/@everisBrasil)
-- 2020-08-19 - [マイクロサービスを連携してみよう](https://thinkit.co.jp/article/17704) by [岡井 裕矢(おかい ゆうや)](https://thinkit.co.jp/author/17588), [泉 勝(いずみ まさる)](https://thinkit.co.jp/author/17705) at [Think IT(シンクイット)](https://thinkit.co.jp/)
-- 2020-08-25 - [OpenAPI Generator と TypeScript で型安全にフロントエンド開発をしている話](https://tech.smarthr.jp/entry/2020/08/25/135631) at [SmartHR Tech Blog](https://tech.smarthr.jp/)
-- 2020-09-10 - [Introduction to OpenAPI with Instana](https://www.instana.com/blog/introduction-to-openapi-with-instana/) by [Cedric Ziel](https://www.instana.com/blog/author/cedricziel/) at [Instana Blog](https://www.instana.com/blog/)
-- 2020-09-17 - [Generate PowerShellSDK using openapi-generator](https://medium.com/@ghufz.learn/generate-powershellsdk-using-openapi-generator-33b700891e33) by [Ghufran Zahidi](https://medium.com/@ghufz.learn)
-- 2020-09-24 - [How to automate API code generation (OpenAPI/Swagger) and boost productivity - Tutorial with React Native featuring TypeScript](https://medium.com/@sceleski/how-to-automate-api-code-generation-openapi-swagger-and-boost-productivity-1176a0056d8a) by [Sanjin Celeski](https://medium.com/@sceleski)
-- 2020-09-25 - [Generate OpenAPI Angular Client](https://medium.com/@pguso/generate-openapi-angular-client-8c9288e8bbd4) by [Patric](https://medium.com/@pguso)
-- 2020-10-24 - [Working with Microsoft Identity - React Native Client](https://www.josephguadagno.net/2020/10/24/working-with-microsoft-identity-react-native-client) by [Joseph Guadagno](https://www.josephguadagno.net/)
-- 2020-10-31 - [[B2] OpenAPI Specification으로 타입-세이프하게 API 개발하기: 희망편 VS 절망편](https://www.youtube.com/watch?v=J4JHLESAiFk) by 최태건 at [FEConf 2020](https://2020.feconf.kr/)
-- 2020-11-05 - [Automated REST-Api Code Generation: Wie IT-Systeme miteinander sprechen](https://www.massiveart.com/blog/automated-rest-api-code-generation-wie-it-systeme-miteinander-sprechen) by Stefan Rottensteiner at [MASSIVE ART Blog](https://www.massiveart.com/blog)
-- 2020-12-01 - [OpenAPI GeneratorでGoのAPIサーバー/クライアントコードを自動生成する](https://qiita.com/saki-engineering/items/b20d8b6074c4da9664a5) by [@saki-engineering](https://qiita.com/saki-engineering)
-- 2020-12-04 - [Scaling the Test Coverage of OpenAPI Generator for 30+ Programming Languages](https://www.youtube.com/watch?v=7Lke9dHRqT0) by [William Cheng](https://github.com/wing328) at [Open Source Summit Japan + Automotive Linux Summit 2020](https://events.linuxfoundation.org/archive/2020/open-source-summit-japan/) ([Slides](https://speakerdeck.com/wing328/scaling-the-test-coverage-of-openapi-generator-for-30-plus-programming-languages))
-- 2020-12-09 - [プロジェクトにOpenAPI Generatorで自動生成された型付きAPI Clientを導入した話](https://qiita.com/yoshifujiT/items/905c18700ede23f40840) by [@yoshifujiT](https://github.com/yoshifujiT)
-- 2020-12-15 - [Next.js + NestJS + GraphQLで変化に追従するフロントエンドへ 〜 ショッピングクーポンの事例紹介](https://techblog.yahoo.co.jp/entry/2020121530052952/) by [小倉 陸](https://github.com/ogugu9) at [Yahoo! JAPAN Tech Blog](https://techblog.yahoo.co.jp/)
-- 2021-01-08 - [Hello, New API – Part 1](https://www.nginx.com/blog/hello-new-api-part-1/) by [Jeremy Schulman](https://www.nginx.com/people/jeremy-schulman/) at [Major League Baseball](https://www.mlb.com)
-- 2021-01-18 - [「アプリ開発あるある」を疑うことから始まった、API Clientコードの自動生成【デブスト2020】](https://codezine.jp/article/detail/13406?p=2) by [CodeZine編集部](https://codezine.jp/author/1)
-- 2021-02-05 - [REST-API-Roundtrip with SpringDoc and OpenAPI Generator](https://blog.viadee.de/en/rest-api-roundtrip) by [Benjamin Klatt](https://twitter.com/benklatt) at [viadee](https://www.viadee.de/en/)
-- 2021-02-17 - [REST-API-Roundtrip with SpringDoc and OpenAPI Generator](https://medium.com/nerd-for-tech/rest-api-roundtrip-with-springdoc-and-openapi-generator-30bd27ccf698) by [cloud @viadee](https://cloud-viadee.medium.com/)
-- 2021-03-08 - [OpenAPI Generator 工具的躺坑尝试](https://blog.csdn.net/u013019701/article/details/114531975) by [独家雨天](https://blog.csdn.net/u013019701) at [CSDN官方博客](https://blog.csdn.net/)
-- 2021-03-16 - [如何基于 Swagger 使用 OpenAPI Generator 生成 JMeter 脚本?](https://cloud.tencent.com/developer/article/1802704) by [高楼Zee](https://cloud.tencent.com/developer/user/5836255) at [腾讯云专栏](https://cloud.tencent.com/developer/column)
-- 2021-03-24 - [openapi-generator-cli による TypeScript 型定義](https://zenn.dev/takepepe/articles/openapi-generator-cli-ts) by [Takefumi Yoshii](https://zenn.dev/takepepe)
-- 2021-03-28 - [Trying out NestJS part 4: Generate Typescript clients from OpenAPI documents](https://dev.to/arnaudcortisse/trying-out-nestjs-part-4-generate-typescript-clients-from-openapi-documents-28mk) by [Arnaud Cortisse](https://dev.to/arnaudcortisse)
-- 2021-03-31 - [Open API Server Implementation Using OpenAPI Generator](https://www.baeldung.com/java-openapi-generator-server) at [Baeldung](https://www.baeldung.com/)
-- 2021-03-31 - [使用OpenAPI Generator實現Open API Server](https://www.1ju.org/article/java-openapi-generator-server) at [億聚網](https://www.1ju.org/)
-- 2021-04-19 - [Introducing Twilio’s OpenAPI Specification Beta](https://www.twilio.com/blog/introducing-twilio-open-api-specification-beta) by [GARETH PAUL JONES](https://www.twilio.com/blog/author/gpj) at [Twilio Blog](https://www.twilio.com/blog)
-- 2021-04-22 - [Leveraging OpenApi strengths in a Micro-Service environment](https://medium.com/unibuddy-technology-blog/leveraging-openapi-strengths-in-a-micro-service-environment-3d7f9e7c26ff) by Nicolas Jellab at [Unibuddy Technology Blog](https://medium.com/unibuddy-technology-blog)
-- 2021-04-27 - [From zero to publishing PowerShell API clients in PowerShell Gallery within minutes](https://speakerdeck.com/wing328/from-zero-to-publishing-powershell-api-clients-in-powershell-gallery-within-minutes) by [William Cheng](https://github.com/wing328) at [PowerShell + DevOps Global Summit 2021](https://events.devopscollective.org/event/powershell-devops-global-summit-2021/)
-- 2021-05-31 - [FlutterでOpen Api Generator(Swagger)を使う](https://aakira.app/blog/2021/05/flutter-open-api/) by [AAkira](https://twitter.com/_a_akira)
-- 2021-06-22 - [Rest API Documentation and Client Generation With OpenAPI](https://dzone.com/articles/rest-api-documentation-and-client-generation-with) by [Prasanth Gullapalli](https://dzone.com/users/1011797/prasanthnath.g@gmail.com.html)
-- 2021-07-16 - [銀行事業のサーバーサイド開発について / LINE 京都開発室 エンジニア採用説明会](https://www.youtube.com/watch?v=YrrKQHxLPpQ) by 野田誠人, Robert Mitchell
-- 2021-07-19 - [OpenAPI code generation with kotlin](https://sylhare.github.io/2021/07/19/Openapi-swagger-codegen-with-kotlin.html) by [sylhare](https://github.com/sylhare)
-- 2021-07-29 - [How To Rewrite a Huge Codebase](https://dzone.com/articles/how-to-rewrite-a-huge-code-base) by [Curtis Poe](https://dzone.com/users/4565446/publiusovidius.html)
-- 2021-08-21 - [Generating Client APIs using Swagger Part 1](https://medium.com/@flowsquad/generating-client-apis-using-swagger-part-1-2d46f13f5e92) by [FlowSquad.io](https://medium.com/@flowsquad)
-- 2021-09-11 - [Invoking AWS ParallelCluster API](https://docs.aws.amazon.com/parallelcluster/latest/ug/api-reference-v3.html) at [AWS ParallelCluster API official documentation](https://docs.aws.amazon.com/parallelcluster/latest/ug/api-reference-v3.html)
-- 2021-09-20 - [OpenAPI Generator - The Babel Fish of the API World](https://www.youtube.com/watch?v=s2zMtwd5klg) by [Cliffano Subagio (Principal Engineer at Shine Solutions)](https://github.com/cliffano) at [Apidays LIVE Australia 2021](https://www.apidays.global/australia2021/)
-- 2021-10-02 - [How to Write Fewer Lines of Code with the OpenAPI Generator](https://hackernoon.com/how-to-write-fewer-lines-of-code-with-the-openapi-generator) by [Mikhail Alfa](https://hackernoon.com/u/alphamikle)
-- 2021-10-12 - [OpenAPI Generator : 4000 étoiles sur GitHub et des spaghettis](https://www.youtube.com/watch?v=9hEsNBSqTFk) by [Jérémie Bresson](https://github.com/jmini) at [Devoxx FR 2021](https://cfp.devoxx.fr/2021/speaker/jeremie_bresson)
-- 2021-10-17 - [Generate a TypeScript HTTP Client From An OpenAPI Spec In DotNET 5](https://richardwillis.info/blog/generate-a-type-script-http-client-from-an-open-api-spec-in-dot-net-5) by [Richard Willis](https://github.com/badsyntax)
-- 2021-11-06 - [スタートアップの開発で意識したこと](https://zenn.dev/woo_noo/articles/5cb09f8e2899ae782ad1) by [woo-noo](https://zenn.dev/woo_noo)
-- 2021-11-09 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/effective-software-development-using-openapi-generator) by Ajil Oomme
-- 2021-12-07 - [An Introduction to OpenAPI](https://betterprogramming.pub/4-use-cases-of-openapi-which-are-good-to-know-1a041f4ad71e) by [Na'aman Hirschfeld](https://naamanhirschfeld.medium.com/)
-- 2022-01-02 - [Towards a secure API client generator for IoT devices](https://arxiv.org/abs/2201.00270) by Anders Aaen Springborg, Martin Kaldahl Andersen, Kaare Holland Hattel, Michele Albano
-- 2022-02-02 - [Use OpenApi generator to share your models between Flutter and your backend](https://www.youtube.com/watch?v=kPW7ccu9Yvk) by [Guillaume Bernos](https://feb2022.fluttervikings.com/speakers/guillaume_bernos) at [Flutter Vikings Conference 2022 (Hybrid)](https://feb2022.fluttervikings.com/)
-- 2022-03-15 - [OpenAPI Specでハイフン区切りのEnum値をOpenAPI Generatorで出力すると、ハイフン区切りのまま出力される](https://qiita.com/yuji38kwmt/items/824d74d4889055ab37d8) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
-- 2022-04-01 - [OpenAPI Generatorのコード生成とSpring Frameworkのカスタムデータバインディングを共存させる](https://techblog.zozo.com/entry/coexistence-of-openapi-and-spring) in [ZOZO Tech Blog](https://techblog.zozo.com/)
-- 2022-04-06 - [Effective Software Development using OpenAPI Generator](https://apexlabs.ai/post/openapi-generator) by Ajil Oommen (Senior Flutter Developer)
-- 2022-05-13 - [A Path From an API To Client Libraries](https://www.youtube.com/watch?v=XC8oVn_efTw) by [Filip Srnec](https://www.devoxx.co.uk/talk/?id=11211) at Infobip
-- 2022-06-01 - [API First, using OpenAPI and Spring Boot](https://medium.com/xgeeks/api-first-using-openapi-and-spring-boot-2602c04bb0d3) by [Micael Estrázulas Vianna](https://estrazulas.medium.com/)
-- 2022-07-01 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
-- 2022-07-22 - [使用OpenAPI Generator Maven plugin开发api优先的java客户端和服务端代码](https://blog.roccoshi.top/2022/java/openapi-generator%E7%9A%84%E4%BD%BF%E7%94%A8/) by [Lincest](https://github.com/Lincest)
-- 2022-08-01 - [Tutorial: Etsy Open API v3 (ruby)](https://blog.tjoyal.dev/etsy-open-api-v3/) by [Thierry Joyal](https://github.com/tjoyal)
-- 2022-09-03 - [OpenAPI Generator For Go Web Development](https://blog.kevinhu.me/2022/09/03/03-openapi-generator/) by [Kevin Hu](https://twitter.com/Oldgunix)
-- 2022-10-01 - [OpenAPI Generatorをカスタマイズしたコードを生成する(Swagger Codegenとほぼ同じ)](https://nainaistar.hatenablog.com/entry/2022/10/03/120000) by [きり丸](https://twitter.com/nainaistar)
-- 2022-10-21 - [Kotlin(Spring Boot)の API を OpenAPI Generator で自動生成](https://zenn.dev/msksgm/articles/20221021-kotlin-spring-openapi-generator) by [msksgm](https://zenn.dev/msksgm)
-- 2022-10-26 - [Quarkus Insights #106: Quarkiverse Extension Spotlight: OpenApi Generator](https://www.youtube.com/watch?v=_s_if69t2iQ) by [Quarkusio](https://www.youtube.com/c/Quarkusio)
-
-## [6 - About Us](#table-of-contents)
-
-What's the design philosophy or principle behind OpenAPI Generator?
-
-We focus on developer experience. The generators should produce code, config, documentation, and more that are easily understandable and consumable by users. We focused on simple use cases to start with (bottom-up approach). Since then the project and the community have grown a lot: 300k weekly downloads via NPM CLI wrapper, 20M downloads via openapi-generator-cli docker image just to highlight a few. We've gradually supported more features (e.g. oneOf, anyOf introduced in OpenAPI 3.0) in various generators and we will continue this approach to deliver something based on our understanding of user demand and what they want, and continue to add support of new features introduced in OpenAPI specification (such as v3.1 and future versions of the OpenAPI specification).
-
-### [6.1 - OpenAPI Generator Core Team](#table-of-contents)
-
-OpenAPI Generator core team members are contributors who have been making significant contributions (review issues, fix bugs, make enhancements, etc) to the project on a regular basis.
-
-#### Core Team Members
-* [@wing328](https://github.com/wing328) (2015/07) [:heart:](https://www.patreon.com/wing328)
-* [@jimschubert](https://github.com/jimschubert) (2016/05) [:heart:](https://www.patreon.com/jimschubert)
-* [@cbornet](https://github.com/cbornet) (2016/05)
-* [@jmini](https://github.com/jmini) (2018/04)  [:heart:](https://www.patreon.com/jmini)
-* [@etherealjoy](https://github.com/etherealjoy) (2019/06)
-* [@spacether](https://github.com/spacether) (2020/05) [:heart:][spacether sponsorship]
-
-:heart: = Link to support the contributor directly
-
-[spacether sponsorship]: https://github.com/sponsors/spacether/
-
-#### Template Creator
-
-**NOTE**: Embedded templates are only supported in _Mustache_ format. Support for all other formats is experimental and subject to change at any time.
-
-Here is a list of template creators:
- * API Clients:
-   * Ada: @stcarrez
-   * Apex: @asnelling
-   * Bash: @bkryza
-   * C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
-   * C++ REST: @Danielku15
-   * C++ Tiny: @AndersSpringborg @kaareHH @michelealbano @mkakbas
-   * C++ UE4: @Kahncode
-   * C# (.NET 2.0): @who
-   * C# (.NET Standard 1.3 ): @Gronsak
-   * C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * C# (GenericHost): @devhl-labs
-   * C# (HttpClient): @Blackclaws
-   * Clojure: @xhh
-   * Crystal: @wing328
-   * Dart: @yissachar
-   * Dart (refactor): @joernahrens
-   * Dart 2: @swipesight
-   * Dart (Jaguar): @jaumard
-   * Dart (Dio): @josh-burton
-   * Elixir: @niku
-   * Elm: @eriktim
-   * Eiffel: @jvelilla
-   * Erlang: @tsloughter
-   * Erlang (PropEr): @jfacorro @robertoaloi
-   * Groovy: @victorgit
-   * Go: @wing328 [:heart:](https://www.patreon.com/wing328)
-   * Go (rewritten in 2.3.0): @antihax
-   * Haskell (http-client): @jonschoning
-   * Java (Feign): @davidkiss
-   * Java (Retrofit): @0legg
-   * Java (Retrofit2): @emilianobonassi
-   * Java (Jersey2): @xhh
-   * Java (okhttp-gson): @xhh
-   * Java (RestTemplate): @nbruno
-   * Java (Spring 5 WebClient): @daonomic
-   * Java (RESTEasy): @gayathrigs
-   * Java (Vertx): @lopesmcc
-   * Java (Google APIs Client Library): @charlescapps
-   * Java (Rest-assured): @viclovsky
-   * Java (Java 11 Native HTTP client): @bbdouglas
-   * Java (Apache HttpClient): @harrywhite4
-   * Java (Helidon): @spericas @tjquinno @tvallin
-   * Javascript/NodeJS: @jfiala
-   * JavaScript (Apollo DataSource): @erithmetic
-   * JavaScript (Closure-annotated Angular) @achew22
-   * JavaScript (Flow types) @jaypea
-   * JMeter: @davidkiss
-   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * Kotlin (MultiPlatform): @andrewemery
-   * Kotlin (Volley): @alisters
-   * Lua: @daurnimator
-   * Nim: @hokamoto
-   * OCaml: @cgensoul
-   * Perl: @wing328 [:heart:](https://www.patreon.com/wing328)
-   * PHP (Guzzle): @baartosz
-   * PHP (with Data Transfer): @Articus
-   * PowerShell: @beatcracker
-   * PowerShell (refactored in 5.0.0): @wing328
-   * Python: @spacether [:heart:][spacether sponsorship]
-   * Python-Experimental: @spacether [:heart:][spacether sponsorship]
-   * R: @ramnov
-   * Ruby (Faraday): @meganemura @dkliban
-   * Rust: @farcaller
-   * Rust (rust-server): @metaswitch
-   * Scala (scalaz & http4s): @tbrown1979
-   * Scala (Akka): @cchafer
-   * Scala (sttp): @chameleon82
-   * Swift: @tkqubo
-   * Swift 3: @hexelon
-   * Swift 4: @ehyche
-   * Swift 5: @4brunu
-   * TypeScript (Angular1): @mhardorf
-   * TypeScript (Angular2): @roni-frantchi
-   * TypeScript (Angular6): @akehir
-   * TypeScript (Angular7): @topce
-   * TypeScript (Axios): @nicokoenig
-   * TypeScript (Fetch): @leonyu
-   * TypeScript (Inversify): @gualtierim
-   * TypeScript (jQuery): @bherila
-   * TypeScript (Nestjs): @vfrank66
-   * TypeScript (Node):  @mhardorf
-   * TypeScript (Rxjs): @denyo
-   * TypeScript (redux-query): @petejohansonxo
- * Server Stubs
-   * Ada: @stcarrez
-   * C# ASP.NET 5: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * C# ASP.NET Core 3.0: @A-Joshi
-   * C# APS.NET Core 3.1: @phatcher
-   * C# Azure functions: @Abrhm7786
-   * C# NancyFX: @mstefaniuk
-   * C++ (Qt5 QHttpEngine): @etherealjoy
-   * C++ Pistache: @sebymiano
-   * C++ Restbed: @stkrwork
-   * Erlang Server: @galaxie
-   * F# (Giraffe) Server: @nmfisher
-   * Go Server: @guohuang
-   * Go (Echo) Server: @ph4r5h4d
-   * Go (Gin) Server: @kemokemo
-   * GraphQL Express Server: @renepardon
-   * Haskell Servant: @algas
-   * Haskell Yesod: @yotsuya
-   * Java Camel: @carnevalegiacomo
-   * Java MSF4J: @sanjeewa-malalgoda
-   * Java Spring Boot: @diyfr
-   * Java Undertow: @stevehu
-   * Java Play Framework: @JFCote
-   * Java PKMST: @anshu2185 @sanshuman @rkumar-pk @ninodpillai
-   * Java Vert.x: @lwlee2608
-   * Java Micronaut: @andriy-dmytruk
-   * Java Helidon: @spericas @tjquinno @tvallin
-   * JAX-RS RestEasy: @chameleon82
-   * JAX-RS CXF: @hiveship
-   * JAX-RS CXF (CDI): @nickcmaynard
-   * JAX-RS RestEasy (JBoss EAP): @jfiala
-   * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * Kotlin (Spring Boot): @dr4ke616
-   * Kotlin (Vertx): @Wooyme
-   * Kotlin (JAX-RS): @anttileppa
-   * NodeJS Express: @YishTish
-   * PHP Laravel: @renepardon
-   * PHP Lumen: @abcsun
-   * PHP Mezzio (with Path Handler): @Articus
-   * PHP Slim: @jfastnacht
-   * PHP Slim4: [@ybelenko](https://github.com/ybelenko)
-   * PHP Symfony: @ksm2
-   * PHP Symfony6: @BenjaminHae
-   * Python FastAPI: @krjakbrjak
-   * Python AIOHTTP:
-   * Ruby on Rails 5: @zlx
-   * Rust (rust-server): @metaswitch
-   * Scala Akka: @Bouillie
-   * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
-   * Scala Lagom: @gmkumar2005
-   * Scala Play: @adigerber
- * Documentation
-   * AsciiDoc: @man-at-home
-   * HTML Doc 2: @jhitchcock
-   * Confluence Wiki: @jhitchcock
-   * PlantUML: @pburls
- * Configuration
-   * Apache2: @stkrwork
-   * k6: @mostafa
- * Schema
-   * Avro: @sgadouar
-   * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
-   * Ktorm: @Luiz-Monad
-   * MySQL: [@ybelenko](https://github.com/ybelenko)
-   * Protocol Buffer: @wing328
-   * WSDL @adessoDpd
-
-:heart: = Link to support the contributor directly
-
-#### How to join the core team
-
-Here are the requirements to become a core team member:
-- rank within top 50 in https://github.com/openapitools/openapi-generator/graphs/contributors
-  - to contribute, here are some good [starting points](https://github.com/openapitools/openapi-generator/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
-- regular contributions to the project
-  - about 3 hours per week
-  - for contribution, it can be addressing issues, reviewing PRs submitted by others, submitting PR to fix bugs or make enhancements, etc
-  - must be active in the past 3 months at the time of application
-
- To join the core team, please reach out to team@openapitools.org for more information.
-
- To become a Template Creator, simply submit a PR for new API client (e.g. Rust, Elixir) or server stub (e.g. Ruby Grape) generator.
-
-### [6.2 - OpenAPI Generator Technical Committee](#table-of-contents)
-
-Members of the OpenAPI Generator technical committee shoulder the following responsibilities:
-
-- Provides guidance and direction to other users
-- Reviews pull requests and issues
-- Improves the generator by making enhancements, fixing bugs or updating documentations
-- Sets the technical direction of the generator
-
-Who is eligible? Those who want to join must have at least 3 PRs merged into a generator. (Exceptions can be granted to template creators or contributors who have made a lot of code changes with less than 3 merged PRs)
-
-If you want to join the committee, please kindly apply by sending an email to team@openapitools.org with your Github ID.
-
-#### Members of Technical Committee
-
-| Languages/Generators         | Member (join date)                                                                                                                                                                                                                |
-| :---------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ActionScript      |                                                                                                                                                                                                                                   |
-| Ada               | @stcarrez (2018/02) @michelealbano (2018/02)                                                                                                                                                                                        |
-| Android           | @jaz-ah (2017/09)                                                                                                                                                                                                                 |
-| Apex              |                                                                                                                                                                                                                                   |
-| Bash              | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09)                                                                                                                                                                       |
-| C                 | @zhemant (2018/11) @ityuhui (2019/12) @michelealbano (2020/03)                                                                                                                                                                   |
-| C++               | @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @martindelille (2018/03) @muttleyxd (2019/08)                                                                                                                     |
-| C#                | @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)                                                                               |
-| Clojure           |                                                                                                                                                                                                                                   |
-| Crystal           | @cyangle (2021/01) |
-| Dart              | @jaumard (2018/09) @josh-burton (2019/12) @amondnet (2019/12) @sbu-WBT (2020/12) @kuhnroyal (2020/12) @agilob (2020/12) @ahmednfwela (2021/08)                                                                                                      |
-| Eiffel            | @jvelilla (2017/09)                                                                                                                                                                                                               |
-| Elixir            | @mrmstn (2018/12)                                                                                                                                                                                                                 |
-| Elm               | @eriktim (2018/09)                                                                                                                                                                                                                |
-| Erlang            | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10)                                                                                                                                                                  |
-| F#                | @nmfisher (2019/05)                                                                                                                                                                                                               |
-| Go                | @antihax (2017/11) @grokify (2018/07) @kemokemo (2018/09) @jirikuncar (2021/01) @ph4r5h4d (2021/04)                                                                                                                                   |
-| GraphQL           | @renepardon (2018/12)                                                                                                                                                                                                             |
-| Groovy            |                                                                                                                                                                                                                                   |
-| Haskell           |                                                                                                                                                                                                                                   |
-| Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10)                        |
-| Java Spring             | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)                   |
-| JMeter               | @kannkyo (2021/01)                                                                                                                                                                                                            |
-| Kotlin            | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)                                                        |
-| Lua               | @daurnimator (2017/08)                                                                                                                                                                                                            |
-| Nim               |                                                                                                                                                                                                                                   |
-| NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07)                                                                                                                                                                         |
-| ObjC              |                                                                                                                                                                                                                                   |
-| OCaml             | @cgensoul (2019/08)                                                                                                                                                                                                               |
-| Perl              | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06)                                                                                                                                               |
-| PHP               | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), [@ybelenko](https://github.com/ybelenko) (2018/07), @renepardon (2018/12)                     |
-| PowerShell        | @wing328 (2020/05)                                                                                                                                                                                                                                  |
-| Python            | @spacether (2019/11) [:heart:][spacether sponsorship]               |
-| R                 | @Ramanth (2019/07) @saigiridhar21 (2019/07)                                                                                                                                                                                       |
-| Ruby              | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)                                                                                                                                                                             |
-| Rust              | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10)                                                                                                                               |
-| Scala             | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)                                                          |
-| Swift             | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11)                                                                                                                                       |
-| TypeScript        | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) |
-
-
-Past Members of Technical Committee:
-| Languages/Generators         | Member (join date)                                                                                                                                                                                                                |
-| :---------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Python            | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @arun-nalla (2019/11)  |
-
-
-:heart: = Link to support the contributor directly
-
-### [6.3 - History of OpenAPI Generator](#table-of-contents)
-
-OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/swagger-codegen). In view of the issues with the Swagger Codegen 3.0.0 (beta) release and the disagreement on the project's direction, more than 40 top contributors and template creators of Swagger Codegen decided to fork Swagger Codegen and maintain a community-driven version called "OpenAPI Generator". Please refer to the [Q&A](docs/qna.md) for more information.
-
-#### Founding Members (alphabetical order):
-
-- [Akihito Nakano](https://github.com/ackintosh)
-- [Artem Ocheredko](https://github.com/galaxie)
-- [Arthur Mogliev](https://github.com/Articus)
-- [Bartek Kryza](https://github.com/bkryza)
-- [Ben Wells](https://github.com/bvwells)
-- [Benjamin Gill](https://github.com/bjgill)
-- [Christophe Bornet](https://github.com/cbornet)
-- [Cliffano Subagio](https://github.com/cliffano)
-- [Daiki Matsudate](https://github.com/d-date)
-- [Daniel](https://github.com/Danielku15)
-- [Emiliano Bonassi](https://github.com/emilianobonassi)
-- [Erik Timmers](https://github.com/eriktim)
-- [Esteban Gehring](https://github.com/macjohnny)
-- [Gustavo Paz](https://github.com/gustavoapaz)
-- [Javier Velilla](https://github.com/jvelilla)
-- [Jean-François Côté](https://github.com/JFCote)
-- [Jim Schubert](https://github.com/jimschubert)
-- [Jon Schoning](https://github.com/jonschoning)
-- [Jérémie Bresson](https://github.com/jmini) [:heart:](https://www.patreon.com/jmini)
-- [Jörn Ahrens](https://github.com/jayearn)
-- [Keni Steward](https://github.com/kenisteward)
-- [Marcin Stefaniuk](https://github.com/mstefaniuk)
-- [Martin Delille](https://github.com/MartinDelille)
-- [Masahiro Yamauchi](https://github.com/algas)
-- [Michele Albano](https://github.com/michelealbano)
-- [Ramzi Maalej](https://github.com/ramzimaalej)
-- [Ravindra Nikam](https://github.com/ravinikam)
-- [Ricardo Cardona](https://github.com/ricardona)
-- [Sebastian Haas](https://github.com/sebastianhaas)
-- [Sebastian Mandrean](https://github.com/mandrean)
-- [Sreenidhi Sreesha](https://github.com/sreeshas)
-- [Stefan Krismann](https://github.com/stkrwork)
-- [Stephane Carrez](https://github.com/stcarrez)
-- [Takuro Wada](https://github.com/taxpon)
-- [Tomasz Prus](https://github.com/tomplus)
-- [Tristan Sloughter](https://github.com/tsloughter)
-- [Victor Orlovsky](https://github.com/viclovsky)
-- [Victor Trakhtenberg](https://github.com/victorgit)
-- [Vlad Frolov](https://github.com/frol)
-- [Vladimir Pouzanov](https://github.com/farcaller)
-- [William Cheng](https://github.com/wing328)
-- [Xin Meng](https://github.com/xmeng1) [:heart:](https://www.patreon.com/user/overview?u=16435385)
-- [Xu Hui Hui](https://github.com/xhh)
-- [antihax](https://github.com/antihax)
-- [beatcracker](https://github.com/beatcracker)
-- [daurnimator](https:/github.com/daurnimator)
-- [etherealjoy](https://github.com/etherealjoy)
-- [jfiala](https://github.com/jfiala)
-- [lukoyanov](https://github.com/lukoyanov)
-
-:heart: = Link to support the contributor directly
-
-## [7 - License](#table-of-contents)
--------
-
-Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
-Copyright 2018 SmartBear Software
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
----
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 825842f0cca..a7747b64308 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -632,16 +632,33 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
             boolean addedOSImport = false;
             CodegenModel model = m.getModel();
 
+            List<CodegenProperty> inheritedProperties = new ArrayList<>();
             if (model.getComposedSchemas() != null) {
                 if (model.getComposedSchemas().getAnyOf() != null) {
-                    model.vars.removeAll(model.getComposedSchemas().getAnyOf());
+                    inheritedProperties.addAll(model.getComposedSchemas().getAnyOf());
                 }
                 if (model.getComposedSchemas().getOneOf() != null) {
-                    model.vars.removeAll(model.getComposedSchemas().getOneOf());
+                    inheritedProperties.addAll(model.getComposedSchemas().getOneOf());
                 }
             }
 
-            for (CodegenProperty cp : model.vars) {
+            List<CodegenProperty> codegenProperties = new ArrayList<>();
+            if(model.getIsModel() || (model.getComposedSchemas() != null && model.getComposedSchemas().getAllOf() != null)) {
+                // If the model is a model or is an allOf, use model.vars as it only
+                // contains properties the generated struct will own itself.
+                // If model is no model and it has no composed schemas use
+                // model.vars.
+                codegenProperties.addAll(model.vars);
+            } else if (!model.getIsModel() && model.getComposedSchemas() == null) {
+                codegenProperties.addAll(model.vars);
+            }else {
+                // If the model is no model, but is a
+                // anyOf or oneOf, add all first level options
+                // from anyOf or oneOf.
+                codegenProperties.addAll(inheritedProperties);
+            }
+
+            for (CodegenProperty cp : codegenProperties) {
                 if (!addedTimeImport && ("time.Time".equals(cp.dataType) || (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
                     imports.add(createMapping("import", "time"));
                     addedTimeImport = true;
diff --git a/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index b9bfe5a8ff9..100ddcd0dcb 100644
--- a/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -2028,3 +2028,25 @@ components:
       - type: string
       - format: date-time
         type: string
+    PrimitiveAndPrimitiveTime:
+      type: object
+      properties:
+        id:
+          description: Unique identifier for the file.
+          example: 8cbb43fe-4cdf-4991-8352-c461779cec02
+          type: string
+        uploaded_on:
+          description: When the file was uploaded.
+          example: '2019-12-03T00:10:15+00:00'
+          type: string
+          format: date-time
+    OneOfWithNestedPrimitiveTime:
+      type: object
+      properties:
+        avatar:
+          description: The user's avatar.
+          example: null
+          oneOf:
+            - type: string
+            - $ref: '#/components/schemas/PrimitiveAndPrimitiveTime'
+          nullable: true
diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
index 30c2ee9992b..9b0876cc2fe 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
@@ -63,6 +63,8 @@ docs/NumberOnly.md
 docs/OneOfPrimitiveType.md
 docs/OneOfPrimitiveTypeChild.md
 docs/OneOfPrimitiveTypes.md
+docs/OneOfWithNestedPrimitiveTime.md
+docs/OneOfWithNestedPrimitiveTimeAvatar.md
 docs/Order.md
 docs/OuterComposite.md
 docs/OuterEnum.md
@@ -71,6 +73,7 @@ docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
 docs/Pet.md
 docs/PetApi.md
+docs/PrimitiveAndPrimitiveTime.md
 docs/ReadOnlyFirst.md
 docs/ReadOnlyWithDefault.md
 docs/Return.md
@@ -133,6 +136,8 @@ model_number_only.go
 model_one_of_primitive_type.go
 model_one_of_primitive_type_child.go
 model_one_of_primitive_types.go
+model_one_of_with_nested_primitive_time.go
+model_one_of_with_nested_primitive_time_avatar.go
 model_order.go
 model_outer_composite.go
 model_outer_enum.go
@@ -140,6 +145,7 @@ model_outer_enum_default_value.go
 model_outer_enum_integer.go
 model_outer_enum_integer_default_value.go
 model_pet.go
+model_primitive_and_primitive_time.go
 model_read_only_first.go
 model_read_only_with_default.go
 model_return.go
diff --git a/samples/openapi3/client/petstore/go/go-petstore/README.md b/samples/openapi3/client/petstore/go/go-petstore/README.md
index 3d7dd74d300..30b9a487763 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/README.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/README.md
@@ -169,6 +169,8 @@ Class | Method | HTTP request | Description
  - [OneOfPrimitiveType](docs/OneOfPrimitiveType.md)
  - [OneOfPrimitiveTypeChild](docs/OneOfPrimitiveTypeChild.md)
  - [OneOfPrimitiveTypes](docs/OneOfPrimitiveTypes.md)
+ - [OneOfWithNestedPrimitiveTime](docs/OneOfWithNestedPrimitiveTime.md)
+ - [OneOfWithNestedPrimitiveTimeAvatar](docs/OneOfWithNestedPrimitiveTimeAvatar.md)
  - [Order](docs/Order.md)
  - [OuterComposite](docs/OuterComposite.md)
  - [OuterEnum](docs/OuterEnum.md)
@@ -176,6 +178,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumInteger](docs/OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
  - [Pet](docs/Pet.md)
+ - [PrimitiveAndPrimitiveTime](docs/PrimitiveAndPrimitiveTime.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [ReadOnlyWithDefault](docs/ReadOnlyWithDefault.md)
  - [Return](docs/Return.md)
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
index 8ce9c146b7f..a972742378b 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1989,6 +1989,23 @@ components:
       - type: string
       - format: date-time
         type: string
+    PrimitiveAndPrimitiveTime:
+      properties:
+        id:
+          description: Unique identifier for the file.
+          example: 8cbb43fe-4cdf-4991-8352-c461779cec02
+          type: string
+        uploaded_on:
+          description: When the file was uploaded.
+          example: 2019-12-03T00:10:15Z
+          format: date-time
+          type: string
+      type: object
+    OneOfWithNestedPrimitiveTime:
+      properties:
+        avatar:
+          $ref: '#/components/schemas/OneOfWithNestedPrimitiveTime_avatar'
+      type: object
     _foo_get_default_response:
       example:
         string:
@@ -2155,6 +2172,13 @@ components:
           type: string
       type: object
       example: null
+    OneOfWithNestedPrimitiveTime_avatar:
+      description: The user's avatar.
+      nullable: true
+      oneOf:
+      - type: string
+      - $ref: '#/components/schemas/PrimitiveAndPrimitiveTime'
+      example: null
   securitySchemes:
     petstore_auth:
       flows:
-- 
GitLab


From 05e61ca49397cad5f17accb354af5dbee4d7faee Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Thu, 17 Nov 2022 10:29:01 -0700
Subject: [PATCH 3/9] Simplify the logic

---
 .../codegen/languages/AbstractGoCodegen.java          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index a7747b64308..81e88fcac3d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -643,15 +643,10 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
             }
 
             List<CodegenProperty> codegenProperties = new ArrayList<>();
-            if(model.getIsModel() || (model.getComposedSchemas() != null && model.getComposedSchemas().getAllOf() != null)) {
-                // If the model is a model or is an allOf, use model.vars as it only
-                // contains properties the generated struct will own itself.
-                // If model is no model and it has no composed schemas use
-                // model.vars.
+            if(model.getComposedSchemas() == null || (model.getComposedSchemas() != null && model.getComposedSchemas().getAllOf() != null)) {
+                // If the model is an allOf or does not have any composed schemas, then we can use the model's properties.
                 codegenProperties.addAll(model.vars);
-            } else if (!model.getIsModel() && model.getComposedSchemas() == null) {
-                codegenProperties.addAll(model.vars);
-            }else {
+            } else {
                 // If the model is no model, but is a
                 // anyOf or oneOf, add all first level options
                 // from anyOf or oneOf.
-- 
GitLab


From 4ba2055a0c82f1206e0974b5ef2e7bdc00311822 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Thu, 17 Nov 2022 11:36:05 -0700
Subject: [PATCH 4/9] Add the generated files from the new example

---
 .../docs/OneOfWithNestedPrimitiveTime.md      |  66 +++++++
 .../OneOfWithNestedPrimitiveTimeAvatar.md     |  82 ++++++++
 .../docs/PrimitiveAndPrimitiveTime.md         |  82 ++++++++
 ...model_one_of_with_nested_primitive_time.go | 150 +++++++++++++++
 ...ne_of_with_nested_primitive_time_avatar.go | 153 +++++++++++++++
 .../model_primitive_and_primitive_time.go     | 180 ++++++++++++++++++
 6 files changed, 713 insertions(+)
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTime.md
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTimeAvatar.md
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/docs/PrimitiveAndPrimitiveTime.md
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time_avatar.go
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go

diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTime.md b/samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTime.md
new file mode 100644
index 00000000000..ca0007469f2
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTime.md
@@ -0,0 +1,66 @@
+# OneOfWithNestedPrimitiveTime
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Avatar** | Pointer to [**NullableOneOfWithNestedPrimitiveTimeAvatar**](OneOfWithNestedPrimitiveTimeAvatar.md) |  | [optional] 
+
+## Methods
+
+### NewOneOfWithNestedPrimitiveTime
+
+`func NewOneOfWithNestedPrimitiveTime() *OneOfWithNestedPrimitiveTime`
+
+NewOneOfWithNestedPrimitiveTime instantiates a new OneOfWithNestedPrimitiveTime object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewOneOfWithNestedPrimitiveTimeWithDefaults
+
+`func NewOneOfWithNestedPrimitiveTimeWithDefaults() *OneOfWithNestedPrimitiveTime`
+
+NewOneOfWithNestedPrimitiveTimeWithDefaults instantiates a new OneOfWithNestedPrimitiveTime object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetAvatar
+
+`func (o *OneOfWithNestedPrimitiveTime) GetAvatar() OneOfWithNestedPrimitiveTimeAvatar`
+
+GetAvatar returns the Avatar field if non-nil, zero value otherwise.
+
+### GetAvatarOk
+
+`func (o *OneOfWithNestedPrimitiveTime) GetAvatarOk() (*OneOfWithNestedPrimitiveTimeAvatar, bool)`
+
+GetAvatarOk returns a tuple with the Avatar field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetAvatar
+
+`func (o *OneOfWithNestedPrimitiveTime) SetAvatar(v OneOfWithNestedPrimitiveTimeAvatar)`
+
+SetAvatar sets Avatar field to given value.
+
+### HasAvatar
+
+`func (o *OneOfWithNestedPrimitiveTime) HasAvatar() bool`
+
+HasAvatar returns a boolean if a field has been set.
+
+### SetAvatarNil
+
+`func (o *OneOfWithNestedPrimitiveTime) SetAvatarNil(b bool)`
+
+ SetAvatarNil sets the value for Avatar to be an explicit nil
+
+### UnsetAvatar
+`func (o *OneOfWithNestedPrimitiveTime) UnsetAvatar()`
+
+UnsetAvatar ensures that no value is present for Avatar, not even an explicit nil
+
+[[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/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTimeAvatar.md b/samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTimeAvatar.md
new file mode 100644
index 00000000000..4e65362a321
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/OneOfWithNestedPrimitiveTimeAvatar.md
@@ -0,0 +1,82 @@
+# OneOfWithNestedPrimitiveTimeAvatar
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | Pointer to **string** | Unique identifier for the file. | [optional] 
+**UploadedOn** | Pointer to **time.Time** | When the file was uploaded. | [optional] 
+
+## Methods
+
+### NewOneOfWithNestedPrimitiveTimeAvatar
+
+`func NewOneOfWithNestedPrimitiveTimeAvatar() *OneOfWithNestedPrimitiveTimeAvatar`
+
+NewOneOfWithNestedPrimitiveTimeAvatar instantiates a new OneOfWithNestedPrimitiveTimeAvatar object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewOneOfWithNestedPrimitiveTimeAvatarWithDefaults
+
+`func NewOneOfWithNestedPrimitiveTimeAvatarWithDefaults() *OneOfWithNestedPrimitiveTimeAvatar`
+
+NewOneOfWithNestedPrimitiveTimeAvatarWithDefaults instantiates a new OneOfWithNestedPrimitiveTimeAvatar object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetId
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) GetId() string`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) GetIdOk() (*string, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetId
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) SetId(v string)`
+
+SetId sets Id field to given value.
+
+### HasId
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### GetUploadedOn
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) GetUploadedOn() time.Time`
+
+GetUploadedOn returns the UploadedOn field if non-nil, zero value otherwise.
+
+### GetUploadedOnOk
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) GetUploadedOnOk() (*time.Time, bool)`
+
+GetUploadedOnOk returns a tuple with the UploadedOn field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetUploadedOn
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) SetUploadedOn(v time.Time)`
+
+SetUploadedOn sets UploadedOn field to given value.
+
+### HasUploadedOn
+
+`func (o *OneOfWithNestedPrimitiveTimeAvatar) HasUploadedOn() bool`
+
+HasUploadedOn returns a boolean if a field has been set.
+
+
+[[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/openapi3/client/petstore/go/go-petstore/docs/PrimitiveAndPrimitiveTime.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PrimitiveAndPrimitiveTime.md
new file mode 100644
index 00000000000..29e5f8362c6
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PrimitiveAndPrimitiveTime.md
@@ -0,0 +1,82 @@
+# PrimitiveAndPrimitiveTime
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | Pointer to **string** | Unique identifier for the file. | [optional] 
+**UploadedOn** | Pointer to **time.Time** | When the file was uploaded. | [optional] 
+
+## Methods
+
+### NewPrimitiveAndPrimitiveTime
+
+`func NewPrimitiveAndPrimitiveTime() *PrimitiveAndPrimitiveTime`
+
+NewPrimitiveAndPrimitiveTime instantiates a new PrimitiveAndPrimitiveTime object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewPrimitiveAndPrimitiveTimeWithDefaults
+
+`func NewPrimitiveAndPrimitiveTimeWithDefaults() *PrimitiveAndPrimitiveTime`
+
+NewPrimitiveAndPrimitiveTimeWithDefaults instantiates a new PrimitiveAndPrimitiveTime object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetId
+
+`func (o *PrimitiveAndPrimitiveTime) GetId() string`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *PrimitiveAndPrimitiveTime) GetIdOk() (*string, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetId
+
+`func (o *PrimitiveAndPrimitiveTime) SetId(v string)`
+
+SetId sets Id field to given value.
+
+### HasId
+
+`func (o *PrimitiveAndPrimitiveTime) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### GetUploadedOn
+
+`func (o *PrimitiveAndPrimitiveTime) GetUploadedOn() time.Time`
+
+GetUploadedOn returns the UploadedOn field if non-nil, zero value otherwise.
+
+### GetUploadedOnOk
+
+`func (o *PrimitiveAndPrimitiveTime) GetUploadedOnOk() (*time.Time, bool)`
+
+GetUploadedOnOk returns a tuple with the UploadedOn field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetUploadedOn
+
+`func (o *PrimitiveAndPrimitiveTime) SetUploadedOn(v time.Time)`
+
+SetUploadedOn sets UploadedOn field to given value.
+
+### HasUploadedOn
+
+`func (o *PrimitiveAndPrimitiveTime) HasUploadedOn() bool`
+
+HasUploadedOn returns a boolean if a field has been set.
+
+
+[[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/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
new file mode 100644
index 00000000000..39b81bb2a30
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
@@ -0,0 +1,150 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+)
+
+// OneOfWithNestedPrimitiveTime struct for OneOfWithNestedPrimitiveTime
+type OneOfWithNestedPrimitiveTime struct {
+	Avatar NullableOneOfWithNestedPrimitiveTimeAvatar `json:"avatar,omitempty"`
+	AdditionalProperties map[string]interface{}
+}
+
+type _OneOfWithNestedPrimitiveTime OneOfWithNestedPrimitiveTime
+
+// NewOneOfWithNestedPrimitiveTime instantiates a new OneOfWithNestedPrimitiveTime object
+// This constructor will assign default values to properties that have it defined,
+// and makes sure properties required by API are set, but the set of arguments
+// will change when the set of required properties is changed
+func NewOneOfWithNestedPrimitiveTime() *OneOfWithNestedPrimitiveTime {
+	this := OneOfWithNestedPrimitiveTime{}
+	return &this
+}
+
+// NewOneOfWithNestedPrimitiveTimeWithDefaults instantiates a new OneOfWithNestedPrimitiveTime object
+// This constructor will only assign default values to properties that have it defined,
+// but it doesn't guarantee that properties required by API are set
+func NewOneOfWithNestedPrimitiveTimeWithDefaults() *OneOfWithNestedPrimitiveTime {
+	this := OneOfWithNestedPrimitiveTime{}
+	return &this
+}
+
+// GetAvatar returns the Avatar field value if set, zero value otherwise (both if not set or set to explicit null).
+func (o *OneOfWithNestedPrimitiveTime) GetAvatar() OneOfWithNestedPrimitiveTimeAvatar {
+	if o == nil || isNil(o.Avatar.Get()) {
+		var ret OneOfWithNestedPrimitiveTimeAvatar
+		return ret
+	}
+	return *o.Avatar.Get()
+}
+
+// GetAvatarOk returns a tuple with the Avatar field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+// NOTE: If the value is an explicit nil, `nil, true` will be returned
+func (o *OneOfWithNestedPrimitiveTime) GetAvatarOk() (*OneOfWithNestedPrimitiveTimeAvatar, bool) {
+	if o == nil {
+		return nil, false
+	}
+	return o.Avatar.Get(), o.Avatar.IsSet()
+}
+
+// HasAvatar returns a boolean if a field has been set.
+func (o *OneOfWithNestedPrimitiveTime) HasAvatar() bool {
+	if o != nil && o.Avatar.IsSet() {
+		return true
+	}
+
+	return false
+}
+
+// SetAvatar gets a reference to the given NullableOneOfWithNestedPrimitiveTimeAvatar and assigns it to the Avatar field.
+func (o *OneOfWithNestedPrimitiveTime) SetAvatar(v OneOfWithNestedPrimitiveTimeAvatar) {
+	o.Avatar.Set(&v)
+}
+// SetAvatarNil sets the value for Avatar to be an explicit nil
+func (o *OneOfWithNestedPrimitiveTime) SetAvatarNil() {
+	o.Avatar.Set(nil)
+}
+
+// UnsetAvatar ensures that no value is present for Avatar, not even an explicit nil
+func (o *OneOfWithNestedPrimitiveTime) UnsetAvatar() {
+	o.Avatar.Unset()
+}
+
+func (o OneOfWithNestedPrimitiveTime) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Avatar.IsSet() {
+		toSerialize["avatar"] = o.Avatar.Get()
+	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
+	return json.Marshal(toSerialize)
+}
+
+func (o *OneOfWithNestedPrimitiveTime) UnmarshalJSON(bytes []byte) (err error) {
+	varOneOfWithNestedPrimitiveTime := _OneOfWithNestedPrimitiveTime{}
+
+	if err = json.Unmarshal(bytes, &varOneOfWithNestedPrimitiveTime); err == nil {
+		*o = OneOfWithNestedPrimitiveTime(varOneOfWithNestedPrimitiveTime)
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		delete(additionalProperties, "avatar")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
+type NullableOneOfWithNestedPrimitiveTime struct {
+	value *OneOfWithNestedPrimitiveTime
+	isSet bool
+}
+
+func (v NullableOneOfWithNestedPrimitiveTime) Get() *OneOfWithNestedPrimitiveTime {
+	return v.value
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTime) Set(val *OneOfWithNestedPrimitiveTime) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableOneOfWithNestedPrimitiveTime) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTime) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableOneOfWithNestedPrimitiveTime(val *OneOfWithNestedPrimitiveTime) *NullableOneOfWithNestedPrimitiveTime {
+	return &NullableOneOfWithNestedPrimitiveTime{value: val, isSet: true}
+}
+
+func (v NullableOneOfWithNestedPrimitiveTime) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTime) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time_avatar.go b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time_avatar.go
new file mode 100644
index 00000000000..1e196710bf0
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time_avatar.go
@@ -0,0 +1,153 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// OneOfWithNestedPrimitiveTimeAvatar - The user's avatar.
+type OneOfWithNestedPrimitiveTimeAvatar struct {
+	PrimitiveAndPrimitiveTime *PrimitiveAndPrimitiveTime
+	String *string
+}
+
+// PrimitiveAndPrimitiveTimeAsOneOfWithNestedPrimitiveTimeAvatar is a convenience function that returns PrimitiveAndPrimitiveTime wrapped in OneOfWithNestedPrimitiveTimeAvatar
+func PrimitiveAndPrimitiveTimeAsOneOfWithNestedPrimitiveTimeAvatar(v *PrimitiveAndPrimitiveTime) OneOfWithNestedPrimitiveTimeAvatar {
+	return OneOfWithNestedPrimitiveTimeAvatar{
+		PrimitiveAndPrimitiveTime: v,
+	}
+}
+
+// stringAsOneOfWithNestedPrimitiveTimeAvatar is a convenience function that returns string wrapped in OneOfWithNestedPrimitiveTimeAvatar
+func StringAsOneOfWithNestedPrimitiveTimeAvatar(v *string) OneOfWithNestedPrimitiveTimeAvatar {
+	return OneOfWithNestedPrimitiveTimeAvatar{
+		String: v,
+	}
+}
+
+
+// Unmarshal JSON data into one of the pointers in the struct
+func (dst *OneOfWithNestedPrimitiveTimeAvatar) UnmarshalJSON(data []byte) error {
+	var err error
+	// this object is nullable so check if the payload is null or empty string
+	if string(data) == "" || string(data) == "{}" {
+		return nil
+	}
+
+	match := 0
+	// try to unmarshal data into PrimitiveAndPrimitiveTime
+	err = newStrictDecoder(data).Decode(&dst.PrimitiveAndPrimitiveTime)
+	if err == nil {
+		jsonPrimitiveAndPrimitiveTime, _ := json.Marshal(dst.PrimitiveAndPrimitiveTime)
+		if string(jsonPrimitiveAndPrimitiveTime) == "{}" { // empty struct
+			dst.PrimitiveAndPrimitiveTime = nil
+		} else {
+			match++
+		}
+	} else {
+		dst.PrimitiveAndPrimitiveTime = nil
+	}
+
+	// try to unmarshal data into String
+	err = newStrictDecoder(data).Decode(&dst.String)
+	if err == nil {
+		jsonString, _ := json.Marshal(dst.String)
+		if string(jsonString) == "{}" { // empty struct
+			dst.String = nil
+		} else {
+			match++
+		}
+	} else {
+		dst.String = nil
+	}
+
+	if match > 1 { // more than 1 match
+		// reset to nil
+		dst.PrimitiveAndPrimitiveTime = nil
+		dst.String = nil
+
+		return fmt.Errorf("data matches more than one schema in oneOf(OneOfWithNestedPrimitiveTimeAvatar)")
+	} else if match == 1 {
+		return nil // exactly one match
+	} else { // no match
+		return fmt.Errorf("data failed to match schemas in oneOf(OneOfWithNestedPrimitiveTimeAvatar)")
+	}
+}
+
+// Marshal data from the first non-nil pointers in the struct to JSON
+func (src OneOfWithNestedPrimitiveTimeAvatar) MarshalJSON() ([]byte, error) {
+	if src.PrimitiveAndPrimitiveTime != nil {
+		return json.Marshal(&src.PrimitiveAndPrimitiveTime)
+	}
+
+	if src.String != nil {
+		return json.Marshal(&src.String)
+	}
+
+	return nil, nil // no data in oneOf schemas
+}
+
+// Get the actual instance
+func (obj *OneOfWithNestedPrimitiveTimeAvatar) GetActualInstance() (interface{}) {
+	if obj == nil {
+		return nil
+	}
+	if obj.PrimitiveAndPrimitiveTime != nil {
+		return obj.PrimitiveAndPrimitiveTime
+	}
+
+	if obj.String != nil {
+		return obj.String
+	}
+
+	// all schemas are nil
+	return nil
+}
+
+type NullableOneOfWithNestedPrimitiveTimeAvatar struct {
+	value *OneOfWithNestedPrimitiveTimeAvatar
+	isSet bool
+}
+
+func (v NullableOneOfWithNestedPrimitiveTimeAvatar) Get() *OneOfWithNestedPrimitiveTimeAvatar {
+	return v.value
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTimeAvatar) Set(val *OneOfWithNestedPrimitiveTimeAvatar) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableOneOfWithNestedPrimitiveTimeAvatar) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTimeAvatar) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableOneOfWithNestedPrimitiveTimeAvatar(val *OneOfWithNestedPrimitiveTimeAvatar) *NullableOneOfWithNestedPrimitiveTimeAvatar {
+	return &NullableOneOfWithNestedPrimitiveTimeAvatar{value: val, isSet: true}
+}
+
+func (v NullableOneOfWithNestedPrimitiveTimeAvatar) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableOneOfWithNestedPrimitiveTimeAvatar) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go b/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go
new file mode 100644
index 00000000000..e96239a1df7
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go
@@ -0,0 +1,180 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"time"
+)
+
+// PrimitiveAndPrimitiveTime struct for PrimitiveAndPrimitiveTime
+type PrimitiveAndPrimitiveTime struct {
+	// Unique identifier for the file.
+	Id *string `json:"id,omitempty"`
+	// When the file was uploaded.
+	UploadedOn *time.Time `json:"uploaded_on,omitempty"`
+	AdditionalProperties map[string]interface{}
+}
+
+type _PrimitiveAndPrimitiveTime PrimitiveAndPrimitiveTime
+
+// NewPrimitiveAndPrimitiveTime instantiates a new PrimitiveAndPrimitiveTime object
+// This constructor will assign default values to properties that have it defined,
+// and makes sure properties required by API are set, but the set of arguments
+// will change when the set of required properties is changed
+func NewPrimitiveAndPrimitiveTime() *PrimitiveAndPrimitiveTime {
+	this := PrimitiveAndPrimitiveTime{}
+	return &this
+}
+
+// NewPrimitiveAndPrimitiveTimeWithDefaults instantiates a new PrimitiveAndPrimitiveTime object
+// This constructor will only assign default values to properties that have it defined,
+// but it doesn't guarantee that properties required by API are set
+func NewPrimitiveAndPrimitiveTimeWithDefaults() *PrimitiveAndPrimitiveTime {
+	this := PrimitiveAndPrimitiveTime{}
+	return &this
+}
+
+// GetId returns the Id field value if set, zero value otherwise.
+func (o *PrimitiveAndPrimitiveTime) GetId() string {
+	if o == nil || isNil(o.Id) {
+		var ret string
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *PrimitiveAndPrimitiveTime) GetIdOk() (*string, bool) {
+	if o == nil || isNil(o.Id) {
+		return nil, false
+	}
+	return o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *PrimitiveAndPrimitiveTime) HasId() bool {
+	if o != nil && !isNil(o.Id) {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given string and assigns it to the Id field.
+func (o *PrimitiveAndPrimitiveTime) SetId(v string) {
+	o.Id = &v
+}
+
+// GetUploadedOn returns the UploadedOn field value if set, zero value otherwise.
+func (o *PrimitiveAndPrimitiveTime) GetUploadedOn() time.Time {
+	if o == nil || isNil(o.UploadedOn) {
+		var ret time.Time
+		return ret
+	}
+	return *o.UploadedOn
+}
+
+// GetUploadedOnOk returns a tuple with the UploadedOn field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *PrimitiveAndPrimitiveTime) GetUploadedOnOk() (*time.Time, bool) {
+	if o == nil || isNil(o.UploadedOn) {
+		return nil, false
+	}
+	return o.UploadedOn, true
+}
+
+// HasUploadedOn returns a boolean if a field has been set.
+func (o *PrimitiveAndPrimitiveTime) HasUploadedOn() bool {
+	if o != nil && !isNil(o.UploadedOn) {
+		return true
+	}
+
+	return false
+}
+
+// SetUploadedOn gets a reference to the given time.Time and assigns it to the UploadedOn field.
+func (o *PrimitiveAndPrimitiveTime) SetUploadedOn(v time.Time) {
+	o.UploadedOn = &v
+}
+
+func (o PrimitiveAndPrimitiveTime) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if !isNil(o.Id) {
+		toSerialize["id"] = o.Id
+	}
+	if !isNil(o.UploadedOn) {
+		toSerialize["uploaded_on"] = o.UploadedOn
+	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
+	return json.Marshal(toSerialize)
+}
+
+func (o *PrimitiveAndPrimitiveTime) UnmarshalJSON(bytes []byte) (err error) {
+	varPrimitiveAndPrimitiveTime := _PrimitiveAndPrimitiveTime{}
+
+	if err = json.Unmarshal(bytes, &varPrimitiveAndPrimitiveTime); err == nil {
+		*o = PrimitiveAndPrimitiveTime(varPrimitiveAndPrimitiveTime)
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		delete(additionalProperties, "id")
+		delete(additionalProperties, "uploaded_on")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
+type NullablePrimitiveAndPrimitiveTime struct {
+	value *PrimitiveAndPrimitiveTime
+	isSet bool
+}
+
+func (v NullablePrimitiveAndPrimitiveTime) Get() *PrimitiveAndPrimitiveTime {
+	return v.value
+}
+
+func (v *NullablePrimitiveAndPrimitiveTime) Set(val *PrimitiveAndPrimitiveTime) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePrimitiveAndPrimitiveTime) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePrimitiveAndPrimitiveTime) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePrimitiveAndPrimitiveTime(val *PrimitiveAndPrimitiveTime) *NullablePrimitiveAndPrimitiveTime {
+	return &NullablePrimitiveAndPrimitiveTime{value: val, isSet: true}
+}
+
+func (v NullablePrimitiveAndPrimitiveTime) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePrimitiveAndPrimitiveTime) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
-- 
GitLab


From 3d9ab924c7589d1262cd70a71e317daf1d26d552 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Tue, 6 Dec 2022 12:11:54 -0700
Subject: [PATCH 5/9] Merge master then re-run generate examples

---
 .../petstore-async-middleware/src/apis/mod.rs | 29 +++++++++++++++++++
 ...model_one_of_with_nested_primitive_time.go | 13 ++++++++-
 .../model_primitive_and_primitive_time.go     | 13 ++++++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/mod.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/mod.rs
index 80399c6060c..33b8ca9e647 100644
--- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/mod.rs
+++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/mod.rs
@@ -70,6 +70,35 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => params.append(&mut parse_deep_object(
+                    &format!("{}[{}]", prefix, key),
+                    value,
+                )),
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.append(&mut parse_deep_object(
+                            &format!("{}[{}][{}]", prefix, key, i),
+                            value,
+                        ));
+                    }
+                },
+                serde_json::Value::String(s) => params.push((format!("{}[{}]", prefix, key), s.clone())),
+                _ => params.push((format!("{}[{}]", prefix, key), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported with style=deepObject")
+}
+
 pub mod fake_api;
 pub mod pet_api;
 pub mod store_api;
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
index 39b81bb2a30..1328debe0c4 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_one_of_with_nested_primitive_time.go
@@ -14,6 +14,9 @@ import (
 	"encoding/json"
 )
 
+// checks if the OneOfWithNestedPrimitiveTime type satisfies the MappedNullable interface at compile time
+var _ MappedNullable = &OneOfWithNestedPrimitiveTime{}
+
 // OneOfWithNestedPrimitiveTime struct for OneOfWithNestedPrimitiveTime
 type OneOfWithNestedPrimitiveTime struct {
 	Avatar NullableOneOfWithNestedPrimitiveTimeAvatar `json:"avatar,omitempty"`
@@ -82,6 +85,14 @@ func (o *OneOfWithNestedPrimitiveTime) UnsetAvatar() {
 }
 
 func (o OneOfWithNestedPrimitiveTime) MarshalJSON() ([]byte, error) {
+	toSerialize,err := o.ToMap()
+	if err != nil {
+		return []byte{}, err
+	}
+	return json.Marshal(toSerialize)
+}
+
+func (o OneOfWithNestedPrimitiveTime) ToMap() (map[string]interface{}, error) {
 	toSerialize := map[string]interface{}{}
 	if o.Avatar.IsSet() {
 		toSerialize["avatar"] = o.Avatar.Get()
@@ -91,7 +102,7 @@ func (o OneOfWithNestedPrimitiveTime) MarshalJSON() ([]byte, error) {
 		toSerialize[key] = value
 	}
 
-	return json.Marshal(toSerialize)
+	return toSerialize, nil
 }
 
 func (o *OneOfWithNestedPrimitiveTime) UnmarshalJSON(bytes []byte) (err error) {
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go b/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go
index e96239a1df7..0c0f4c91d2b 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_primitive_and_primitive_time.go
@@ -15,6 +15,9 @@ import (
 	"time"
 )
 
+// checks if the PrimitiveAndPrimitiveTime type satisfies the MappedNullable interface at compile time
+var _ MappedNullable = &PrimitiveAndPrimitiveTime{}
+
 // PrimitiveAndPrimitiveTime struct for PrimitiveAndPrimitiveTime
 type PrimitiveAndPrimitiveTime struct {
 	// Unique identifier for the file.
@@ -108,6 +111,14 @@ func (o *PrimitiveAndPrimitiveTime) SetUploadedOn(v time.Time) {
 }
 
 func (o PrimitiveAndPrimitiveTime) MarshalJSON() ([]byte, error) {
+	toSerialize,err := o.ToMap()
+	if err != nil {
+		return []byte{}, err
+	}
+	return json.Marshal(toSerialize)
+}
+
+func (o PrimitiveAndPrimitiveTime) ToMap() (map[string]interface{}, error) {
 	toSerialize := map[string]interface{}{}
 	if !isNil(o.Id) {
 		toSerialize["id"] = o.Id
@@ -120,7 +131,7 @@ func (o PrimitiveAndPrimitiveTime) MarshalJSON() ([]byte, error) {
 		toSerialize[key] = value
 	}
 
-	return json.Marshal(toSerialize)
+	return toSerialize, nil
 }
 
 func (o *PrimitiveAndPrimitiveTime) UnmarshalJSON(bytes []byte) (err error) {
-- 
GitLab


From 4ab198f9faa2dd595beb4acc244ae9178b10bb91 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Fri, 30 Dec 2022 09:59:36 -0700
Subject: [PATCH 6/9] Update to main, generate examples, and docs

---
 docs/generators/java.md                       |   2 +-
 docs/generators/python-legacy.md              |   2 -
 docs/generators/python-prior.md               |   2 -
 docs/generators/python.md                     |   2 -
 docs/generators/swift5.md                     |   1 -
 docs/generators/typescript-angular.md         |   4 +-
 .../java/feign-gson/.openapi-generator/FILES  |   4 +
 .../client/echo_api/java/feign-gson/pom.xml   |  26 +-
 .../org/openapitools/client/ApiClient.java    |  40 +-
 .../client/ApiResponseDecoder.java            |  38 ++
 .../openapitools/client/ParamExpander.java    |  22 +
 .../client/RFC3339DateFormat.java             |  57 ++
 .../openapitools/client/model/Category.java   |  31 +-
 .../org/openapitools/client/model/Pet.java    |  79 ++-
 .../org/openapitools/client/model/Tag.java    |  31 +-
 ...deTrueArrayStringQueryObjectParameter.java |  24 +-
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 278 +++++++-
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  27 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 595 ++++++++----------
 .../Api/FakeClassnameTags123Api.cs            |  27 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 322 ++++------
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  81 +--
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 229 +++----
 .../src/Org.OpenAPITools/Client/IApi.cs       |  15 +
 .../Client/OpenAPIDateJsonConverter.cs        |  29 +
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 278 +++++++-
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  19 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 497 ++++++---------
 .../Api/FakeClassnameTags123Api.cs            |  19 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 258 +++-----
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  57 +-
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 175 ++----
 .../src/Org.OpenAPITools/Client/IApi.cs       |  15 +
 .../Client/OpenAPIDateJsonConverter.cs        |  29 +
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 266 +++++++-
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  19 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 497 ++++++---------
 .../Api/FakeClassnameTags123Api.cs            |  19 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 258 +++-----
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  57 +-
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 175 ++----
 .../src/Org.OpenAPITools/Client/IApi.cs       |  15 +
 .../Client/OpenAPIDateJsonConverter.cs        |  29 +
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../petstore/go/go-petstore/api_fake.go       |   6 +-
 .../client/petstore/go/go-petstore/api_pet.go |  10 +-
 .../petstore/go/go-petstore/docs/FakeApi.md   |   4 +-
 .../go/go-petstore/docs/FormatTest.md         |   8 +-
 .../petstore/go/go-petstore/docs/PetApi.md    |   8 +-
 .../go/go-petstore/model_format_test_.go      |  12 +-
 .../docs/AdditionalPropertiesClass.md         |  16 +-
 .../models/additional_properties_class.py     |  48 +-
 .../petstore/go/go-petstore/api/openapi.yaml  |   8 +-
 .../petstore/go/go-petstore/api_fake.go       |   6 +-
 .../client/petstore/go/go-petstore/api_pet.go |  10 +-
 .../petstore/go/go-petstore/docs/FakeApi.md   |   4 +-
 .../go/go-petstore/docs/FormatTest.md         |   8 +-
 .../go/go-petstore/docs/MapOfFileTest.md      |   8 +-
 .../petstore/go/go-petstore/docs/PetApi.md    |   8 +-
 .../go/go-petstore/model_format_test_.go      |  12 +-
 .../go/go-petstore/model_map_of_file_test_.go |  12 +-
 .../docs/AdditionalPropertiesClass.md         |   4 +-
 .../models/additional_properties_class.py     |  12 +-
 .../server/petstore/go-api-server/go/api.go   |   2 +-
 .../go-api-server/go/api_pet_service.go       |   2 +-
 .../server/petstore/go-chi-server/go/api.go   |   2 +-
 .../go-chi-server/go/api_pet_service.go       |   2 +-
 .../petstore/go-server-required/go/api.go     |   2 +-
 .../go-server-required/go/api_pet_service.go  |   2 +-
 215 files changed, 5745 insertions(+), 5523 deletions(-)
 create mode 100644 samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiResponseDecoder.java
 create mode 100644 samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ParamExpander.java
 create mode 100644 samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/RFC3339DateFormat.java
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/IApi.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/IApi.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/IApi.cs
 create mode 100644 samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs

diff --git a/docs/generators/java.md b/docs/generators/java.md
index 89cc2f2c33e..43a723d2ed5 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x. or Gson 2.x</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 4.x</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 4.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
diff --git a/docs/generators/python-legacy.md b/docs/generators/python-legacy.md
index 3d0b1165a61..0af42bd30b9 100644
--- a/docs/generators/python-legacy.md
+++ b/docs/generators/python-legacy.md
@@ -45,8 +45,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
-<li>Dict</li>
-<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/python-prior.md b/docs/generators/python-prior.md
index 82e50b4f4a2..00a89120d77 100644
--- a/docs/generators/python-prior.md
+++ b/docs/generators/python-prior.md
@@ -47,8 +47,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
-<li>Dict</li>
-<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/python.md b/docs/generators/python.md
index b62d4af85bc..4cbf616d091 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -47,8 +47,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
-<li>Dict</li>
-<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index 72887e3b55f..2fc6ba96fbc 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -56,7 +56,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
 |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
 |useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null|
-|validatable|Make validation rules and validator for model properies (default: true)| |true|
 
 ## IMPORT MAPPING
 
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index be23681e750..7fde34c39a3 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -11,7 +11,7 @@ title: Documentation for the typescript-angular Generator
 | generator type | CLIENT | |
 | generator language | Typescript | |
 | generator default templating engine | mustache | |
-| helpTxt | Generates a TypeScript Angular (9.x - 15.x) client library. | |
+| helpTxt | Generates a TypeScript Angular (9.x - 14.x) client library. | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
@@ -31,7 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |modelFileSuffix|The suffix of the file of the generated model (model&lt;suffix&gt;.ts).| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |modelSuffix|The suffix of the generated model.| |null|
-|ngVersion|The version of Angular. (At least 9.0.0)| |15.0.3|
+|ngVersion|The version of Angular. (At least 9.0.0)| |14.0.5|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
 |npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
index bc1d247b05c..08189647cf6 100644
--- a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
+++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
@@ -15,7 +15,10 @@ pom.xml
 settings.gradle
 src/main/AndroidManifest.xml
 src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/ApiResponseDecoder.java
 src/main/java/org/openapitools/client/EncodingUtils.java
+src/main/java/org/openapitools/client/ParamExpander.java
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
 src/main/java/org/openapitools/client/ServerConfiguration.java
 src/main/java/org/openapitools/client/ServerVariable.java
 src/main/java/org/openapitools/client/StringUtil.java
@@ -23,6 +26,7 @@ src/main/java/org/openapitools/client/api/BodyApi.java
 src/main/java/org/openapitools/client/api/PathApi.java
 src/main/java/org/openapitools/client/api/QueryApi.java
 src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+src/main/java/org/openapitools/client/auth/DefaultApi20Impl.java
 src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
 src/main/java/org/openapitools/client/model/ApiResponse.java
diff --git a/samples/client/echo_api/java/feign-gson/pom.xml b/samples/client/echo_api/java/feign-gson/pom.xml
index 4a36787dd00..8f0977e98a6 100644
--- a/samples/client/echo_api/java/feign-gson/pom.xml
+++ b/samples/client/echo_api/java/feign-gson/pom.xml
@@ -222,7 +222,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-gson</artifactId>
+            <artifactId>feign-jackson</artifactId>
             <version>${feign-version}</version>
         </dependency>
         <dependency>
@@ -241,16 +241,32 @@
             <version>${feign-version}</version>
         </dependency>
 
+        <!-- JSON processing: jackson -->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson-version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-databind-version}</version>
         </dependency>
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
             <version>${jackson-databind-nullable-version}</version>
         </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.datatype</groupId>
+          <artifactId>jackson-datatype-jsr310</artifactId>
+          <version>${jackson-version}</version>
+        </dependency>
         <dependency>
             <groupId>com.github.scribejava</groupId>
             <artifactId>scribejava-core</artifactId>
@@ -309,7 +325,7 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         <feign-version>10.11</feign-version>
         <feign-form-version>3.8.0</feign-form-version>
-        <gson-version>2.8.6</gson-version>
+        <jackson-version>2.13.4</jackson-version>
         <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
         <jackson-databind-version>2.13.4.2</jackson-databind-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
index b122f0e05eb..eabf2563dd6 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -5,16 +5,23 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import feign.okhttp.OkHttpClient;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import feign.Feign;
 import feign.RequestInterceptor;
 import feign.form.FormEncoder;
-import feign.gson.GsonDecoder;
-import feign.gson.GsonEncoder;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
 import feign.slf4j.Slf4jLogger;
 import org.openapitools.client.auth.HttpBasicAuth;
 import org.openapitools.client.auth.HttpBearerAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
+import org.openapitools.client.ApiResponseDecoder;
 
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@@ -23,16 +30,19 @@ public class ApiClient {
 
   public interface Api {}
 
+  protected ObjectMapper objectMapper;
   private String basePath = "http://localhost:3000";
   private Map<String, RequestInterceptor> apiAuthorizations;
   private Feign.Builder feignBuilder;
 
   public ApiClient() {
     apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
+    objectMapper = createObjectMapper();
     feignBuilder = Feign.builder()
-        .encoder(new FormEncoder(new GsonEncoder()))
-        .decoder(new GsonDecoder())
-        .logger(new Slf4jLogger());
+                .client(new OkHttpClient())
+                .encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
+                .decoder(new ApiResponseDecoder(objectMapper))
+                .logger(new Slf4jLogger());
   }
 
   public ApiClient(String[] authNames) {
@@ -87,8 +97,28 @@ public class ApiClient {
     return this;
   }
 
+  private ObjectMapper createObjectMapper() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.setDateFormat(new RFC3339DateFormat());
+    objectMapper.registerModule(new JavaTimeModule());
+    JsonNullableModule jnm = new JsonNullableModule();
+    objectMapper.registerModule(jnm);
+    return objectMapper;
+  }
+
 
+  public ObjectMapper getObjectMapper(){
+    return objectMapper;
+  }
 
+  public void setObjectMapper(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+  }
 
   /**
    * Creates a feign client for given API interface.
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiResponseDecoder.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiResponseDecoder.java
new file mode 100644
index 00000000000..659cad2102c
--- /dev/null
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiResponseDecoder.java
@@ -0,0 +1,38 @@
+package org.openapitools.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import feign.Response;
+import feign.Types;
+import feign.jackson.JacksonDecoder;
+
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import org.openapitools.client.model.ApiResponse;
+
+public class ApiResponseDecoder extends JacksonDecoder {
+
+    public ApiResponseDecoder(ObjectMapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public Object decode(Response response, Type type) throws IOException {
+    Map<String, Collection<String>> responseHeaders = Collections.unmodifiableMap(response.headers());
+        //Detects if the type is an instance of the parameterized class ApiResponse
+        Type responseBodyType;
+        if (type instanceof ParameterizedType && Types.getRawType(type).isAssignableFrom(ApiResponse.class)) {
+            //The ApiResponse class has a single type parameter, the Dto class itself
+            responseBodyType = ((ParameterizedType) type).getActualTypeArguments()[0];
+            Object body = super.decode(response, responseBodyType);
+            return new ApiResponse(response.status(), responseHeaders, body);
+        } else {
+            //The response is not encapsulated in the ApiResponse, decode the Dto as normal
+            return super.decode(response, type);
+        }
+    }
+}
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ParamExpander.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ParamExpander.java
new file mode 100644
index 00000000000..2331d87fdbd
--- /dev/null
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ParamExpander.java
@@ -0,0 +1,22 @@
+package org.openapitools.client;
+
+import feign.Param;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * Param Expander to convert {@link Date} to RFC3339
+ */
+public class ParamExpander implements Param.Expander {
+
+  private static final DateFormat dateformat = new RFC3339DateFormat();
+
+  @Override
+  public String expand(Object value) {
+    if (value instanceof Date) {
+      return dateformat.format(value);
+    }
+    return value.toString();
+  }
+}
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/RFC3339DateFormat.java
new file mode 100644
index 00000000000..22bbe68c49f
--- /dev/null
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/RFC3339DateFormat.java
@@ -0,0 +1,57 @@
+/*
+ * Echo Server API
+ * Echo Server API
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: team@openapitools.org
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client;
+
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.util.Date;
+import java.text.DecimalFormat;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
+
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  public RFC3339DateFormat() {
+    this.calendar = new GregorianCalendar();
+    this.numberFormat = new DecimalFormat();
+  }
+
+  @Override
+  public Date parse(String source) {
+    return parse(source, new ParsePosition(0));
+  }
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+    return fmt.format(date, toAppendTo, fieldPosition);
+  }
+
+  @Override
+  public Object clone() {
+    return super.clone();
+  }
+}
\ No newline at end of file
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
index 236c8190bb8..b2a52c12a29 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -15,24 +15,27 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * Category
  */
+@JsonPropertyOrder({
+  Category.JSON_PROPERTY_ID,
+  Category.JSON_PROPERTY_NAME
+})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
   public Category() {
@@ -49,12 +52,16 @@ public class Category {
    * @return id
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -71,12 +78,16 @@ public class Category {
    * @return name
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
     this.name = name;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
index 0f511d550b7..3484a3d0c6e 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -15,46 +15,49 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * Pet
  */
+@JsonPropertyOrder({
+  Pet.JSON_PROPERTY_ID,
+  Pet.JSON_PROPERTY_NAME,
+  Pet.JSON_PROPERTY_CATEGORY,
+  Pet.JSON_PROPERTY_PHOTO_URLS,
+  Pet.JSON_PROPERTY_TAGS,
+  Pet.JSON_PROPERTY_STATUS
+})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public static final String SERIALIZED_NAME_CATEGORY = "category";
-  @SerializedName(SERIALIZED_NAME_CATEGORY)
+  public static final String JSON_PROPERTY_CATEGORY = "category";
   private Category category;
 
-  public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
-  @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
+  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
   private List<String> photoUrls = new ArrayList<>();
 
-  public static final String SERIALIZED_NAME_TAGS = "tags";
-  @SerializedName(SERIALIZED_NAME_TAGS)
+  public static final String JSON_PROPERTY_TAGS = "tags";
   private List<Tag> tags = null;
 
   /**
    * pet status in the store
    */
-  @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
     AVAILABLE("available"),
     
@@ -68,6 +71,7 @@ public class Pet {
       this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
       return value;
     }
@@ -77,6 +81,7 @@ public class Pet {
       return String.valueOf(value);
     }
 
+    @JsonCreator
     public static StatusEnum fromValue(String value) {
       for (StatusEnum b : StatusEnum.values()) {
         if (b.value.equals(value)) {
@@ -85,23 +90,9 @@ public class Pet {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
-
-    public static class Adapter extends TypeAdapter<StatusEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
-        jsonWriter.value(enumeration.getValue());
-      }
-
-      @Override
-      public StatusEnum read(final JsonReader jsonReader) throws IOException {
-        String value =  jsonReader.nextString();
-        return StatusEnum.fromValue(value);
-      }
-    }
   }
 
-  public static final String SERIALIZED_NAME_STATUS = "status";
-  @SerializedName(SERIALIZED_NAME_STATUS)
+  public static final String JSON_PROPERTY_STATUS = "status";
   private StatusEnum status;
 
   public Pet() {
@@ -118,12 +109,16 @@ public class Pet {
    * @return id
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -140,12 +135,16 @@ public class Pet {
    * @return name
   **/
   @javax.annotation.Nonnull
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getName() {
     return name;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setName(String name) {
     this.name = name;
   }
@@ -162,12 +161,16 @@ public class Pet {
    * @return category
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CATEGORY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Category getCategory() {
     return category;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_CATEGORY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCategory(Category category) {
     this.category = category;
   }
@@ -189,12 +192,16 @@ public class Pet {
    * @return photoUrls
   **/
   @javax.annotation.Nonnull
+  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -219,12 +226,16 @@ public class Pet {
    * @return tags
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<Tag> getTags() {
     return tags;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -241,12 +252,16 @@ public class Pet {
    * @return status
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public StatusEnum getStatus() {
     return status;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
index 7bfaa5ea05c..2da4a88b526 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -15,24 +15,27 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * Tag
  */
+@JsonPropertyOrder({
+  Tag.JSON_PROPERTY_ID,
+  Tag.JSON_PROPERTY_NAME
+})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
-  public static final String SERIALIZED_NAME_ID = "id";
-  @SerializedName(SERIALIZED_NAME_ID)
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String SERIALIZED_NAME_NAME = "name";
-  @SerializedName(SERIALIZED_NAME_NAME)
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
   public Tag() {
@@ -49,12 +52,16 @@ public class Tag {
    * @return id
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -71,12 +78,16 @@ public class Tag {
    * @return name
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
     this.name = name;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index 433e40e1376..4fc23acdc7e 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -15,22 +15,26 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
  */
+@JsonPropertyOrder({
+  TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.JSON_PROPERTY_VALUES
+})
+@JsonTypeName("test_query_style_form_explode_true_array_string_query_object_parameter")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
-  public static final String SERIALIZED_NAME_VALUES = "values";
-  @SerializedName(SERIALIZED_NAME_VALUES)
+  public static final String JSON_PROPERTY_VALUES = "values";
   private List<String> values = null;
 
   public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() {
@@ -55,12 +59,16 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
    * @return values
   **/
   @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VALUES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<String> getValues() {
     return values;
   }
 
 
+  @JsonProperty(JSON_PROPERTY_VALUES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setValues(List<String> values) {
     this.values = values;
   }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
index 65d841c450c..cf0f5c871be 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
@@ -92,38 +92,31 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
-src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/CookieContainer.cs
-src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
-src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
+src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
+src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
-src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -204,4 +197,3 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
-src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
index f9c1c7f7462..2edcfc0a3d2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
@@ -1 +1,277 @@
-# Created with Openapi Generator
+# Org.OpenAPITools - the C# library for the OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+
+<a name="frameworks-supported"></a>
+## Frameworks supported
+
+<a name="dependencies"></a>
+## Dependencies
+
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
+- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
+- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
+- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
+
+The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package Newtonsoft.Json
+Install-Package JsonSubTypes
+Install-Package System.ComponentModel.Annotations
+Install-Package CompareNETObjects
+```
+<a name="installation"></a>
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] `/bin/sh build.sh`
+- [Windows] `build.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+```
+<a name="packaging"></a>
+## Packaging
+
+A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
+
+This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
+
+```
+nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
+```
+
+Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
+
+<a name="usage"></a>
+## Usage
+
+To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
+```csharp
+Configuration c = new Configuration();
+System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
+webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+c.Proxy = webProxy;
+```
+
+<a name="getting-started"></a>
+## Getting Started
+
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Example
+    {
+        public static void Main()
+        {
+
+            Configuration config = new Configuration();
+            config.BasePath = "http://petstore.swagger.io:80/v2";
+            var apiInstance = new AnotherFakeApi(config);
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test special tags
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (ApiException e)
+            {
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
+                Debug.Print("Status Code: "+ e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+
+        }
+    }
+}
+```
+
+<a name="documentation-for-api-endpoints"></a>
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
+*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
+*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
+*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
+*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
+*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
+*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
+*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
+*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+<a name="documentation-for-models"></a>
+## Documentation for Models
+
+ - [Model.Activity](docs//modelsActivity.md)
+ - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
+ - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
+ - [Model.Animal](docs//modelsAnimal.md)
+ - [Model.ApiResponse](docs//modelsApiResponse.md)
+ - [Model.Apple](docs//modelsApple.md)
+ - [Model.AppleReq](docs//modelsAppleReq.md)
+ - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
+ - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
+ - [Model.ArrayTest](docs//modelsArrayTest.md)
+ - [Model.Banana](docs//modelsBanana.md)
+ - [Model.BananaReq](docs//modelsBananaReq.md)
+ - [Model.BasquePig](docs//modelsBasquePig.md)
+ - [Model.Capitalization](docs//modelsCapitalization.md)
+ - [Model.Cat](docs//modelsCat.md)
+ - [Model.CatAllOf](docs//modelsCatAllOf.md)
+ - [Model.Category](docs//modelsCategory.md)
+ - [Model.ChildCat](docs//modelsChildCat.md)
+ - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
+ - [Model.ClassModel](docs//modelsClassModel.md)
+ - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
+ - [Model.DanishPig](docs//modelsDanishPig.md)
+ - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
+ - [Model.Dog](docs//modelsDog.md)
+ - [Model.DogAllOf](docs//modelsDogAllOf.md)
+ - [Model.Drawing](docs//modelsDrawing.md)
+ - [Model.EnumArrays](docs//modelsEnumArrays.md)
+ - [Model.EnumClass](docs//modelsEnumClass.md)
+ - [Model.EnumTest](docs//modelsEnumTest.md)
+ - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
+ - [Model.File](docs//modelsFile.md)
+ - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
+ - [Model.Foo](docs//modelsFoo.md)
+ - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
+ - [Model.FormatTest](docs//modelsFormatTest.md)
+ - [Model.Fruit](docs//modelsFruit.md)
+ - [Model.FruitReq](docs//modelsFruitReq.md)
+ - [Model.GmFruit](docs//modelsGmFruit.md)
+ - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
+ - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
+ - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
+ - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
+ - [Model.List](docs//modelsList.md)
+ - [Model.Mammal](docs//modelsMammal.md)
+ - [Model.MapTest](docs//modelsMapTest.md)
+ - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model.Model200Response](docs//modelsModel200Response.md)
+ - [Model.ModelClient](docs//modelsModelClient.md)
+ - [Model.Name](docs//modelsName.md)
+ - [Model.NullableClass](docs//modelsNullableClass.md)
+ - [Model.NullableShape](docs//modelsNullableShape.md)
+ - [Model.NumberOnly](docs//modelsNumberOnly.md)
+ - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
+ - [Model.Order](docs//modelsOrder.md)
+ - [Model.OuterComposite](docs//modelsOuterComposite.md)
+ - [Model.OuterEnum](docs//modelsOuterEnum.md)
+ - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
+ - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
+ - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
+ - [Model.ParentPet](docs//modelsParentPet.md)
+ - [Model.Pet](docs//modelsPet.md)
+ - [Model.Pig](docs//modelsPig.md)
+ - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
+ - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
+ - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
+ - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
+ - [Model.Return](docs//modelsReturn.md)
+ - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
+ - [Model.Shape](docs//modelsShape.md)
+ - [Model.ShapeInterface](docs//modelsShapeInterface.md)
+ - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
+ - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
+ - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
+ - [Model.Tag](docs//modelsTag.md)
+ - [Model.Triangle](docs//modelsTriangle.md)
+ - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
+ - [Model.User](docs//modelsUser.md)
+ - [Model.Whale](docs//modelsWhale.md)
+ - [Model.Zebra](docs//modelsZebra.md)
+
+
+<a name="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+<a name="api_key"></a>
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+<a name="api_key_query"></a>
+### api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+<a name="bearer_test"></a>
+### bearer_test
+
+- **Type**: Bearer Authentication
+
+<a name="http_basic_test"></a>
+### http_basic_test
+
+- **Type**: HTTP basic authentication
+
+<a name="http_signature_test"></a>
+### http_signature_test
+
+
+<a name="petstore_auth"></a>
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
index 77826f0673b..a179355d603 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -652,12 +652,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)
             {
@@ -676,7 +676,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)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string? _string = null, System.IO.Stream? binary = null, DateTime? date = null, string? password = null, string? callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 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 _float = 3.4F;  // float? | None (optional) 
+            var _byte = 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 _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime?** | None | [optional]  |
-| **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
+| **_byte** | **byte[]** | None |  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **_string** | **string?** | None | [optional]  |
+| **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
+| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string?** | None | [optional]  |
 | **callback** | **string?** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="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, List<string>? enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string? enumHeaderString = null, string? enumQueryString = null, List<string>? enumFormStringArray = null, string? enumFormString = null)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>?(); // List<string>? | Header parameter enum test (string array) (optional) 
             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 enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
-            var enumFormStringArray = new List<string>?(); // List<string>? | Form parameter enum test (string array) (optional)  (default to $)
+            var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
             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 enumFormStringArray = new List<string>?(); // List<string>? | Form parameter enum test (string array) (optional)  (default to $)
             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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;?**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;?**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
-| **enumFormStringArray** | [**List&lt;string&gt;?**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
+| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumHeaderString** | **string?** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryString** | **string?** | Query parameter enum test (string) | [optional] [default to -efg] |
+| **enumFormStringArray** | [**List&lt;string&gt;?**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string?** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="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)
 
@@ -1053,17 +1053,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)
             {
@@ -1083,7 +1083,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)
 {
@@ -1097,11 +1097,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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
index d5e8e8330a0..4187e44c57d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="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
 
@@ -689,13 +689,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)
@@ -716,7 +716,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);
@@ -734,8 +734,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
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="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)
 
@@ -784,14 +784,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)
@@ -812,7 +812,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);
@@ -829,8 +829,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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
index a862c8c112a..fd1c1a7d62b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -646,13 +646,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)
             {
@@ -672,7 +672,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)
 {
@@ -686,8 +686,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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
index f79869f95a7..1f919450009 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
-**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
index d89ed1a25dc..bc808ceeae3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Message** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**Message** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
index ed572120cd6..32365e6d4d0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
-**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
index 9e225c17232..fde98a967ef 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
+**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**SmallCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
index 6eb0a2e13ea..c2cf3f8e919 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | [default to "default-name"]
+**Id** | **long** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
index a098828a04f..bb35816c914 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
index fcee9662afb..18117e6c938 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
 **NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
+**Shapes** | [**List&lt;Shape&gt;**](Shape.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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
index 7467f67978c..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 **JustSymbol** | **string** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
index 53bbfe31e77..71602270bab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**EnumStringRequired** | **string** |  | 
+**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**EnumString** | **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
index 78c99facf59..47e50daca3e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringProperty** | [**Foo**](Foo.md) |  | [optional] 
+**String** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
index 4e34a6d18b3..0b92c2fb10a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Binary** | **System.IO.Stream** |  | [optional] 
-**ByteProperty** | **byte[]** |  | 
+**Number** | **decimal** |  | 
+**Byte** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**DateTime** | **DateTime** |  | [optional] 
-**DecimalProperty** | **decimal** |  | [optional] 
-**DoubleProperty** | **double** |  | [optional] 
-**FloatProperty** | **float** |  | [optional] 
+**Password** | **string** |  | 
+**Integer** | **int** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Integer** | **int** |  | [optional] 
-**Number** | **decimal** |  | 
-**Password** | **string** |  | 
+**Float** | **float** |  | [optional] 
+**Double** | **double** |  | [optional] 
+**Decimal** | **decimal** |  | [optional] 
+**String** | **string** |  | [optional] 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**Uuid** | **Guid** |  | [optional] 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
-**StringProperty** | **string** |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
index 5dd27228bb0..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
-**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
+**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 0bac85a8e83..031d2b96065 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
index 93139e1d1aa..8bc8049f46f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
index 51cf0636e72..9e0e83645f3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_ClientProperty** | **string** |  | [optional] 
+**_Client** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
index 11f49b9fd40..2ee782c0c54 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**Property** | **string** |  | [optional] 
 **SnakeCase** | **int** |  | [optional] [readonly] 
+**Property** | **string** |  | [optional] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
index ac86336ea70..d4a19d1856b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
+**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
-**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
+**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
index 9f44c24d19a..b737f7d757a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bars** | **List&lt;string&gt;** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
-**Id** | **decimal** |  | [optional] 
 **Uuid** | **string** |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Bars** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
index 8985c59d094..abf676810fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
+**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
index b13bb576b45..7de10304abf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Status** | **string** | pet status in the store | [optional] 
+**Id** | **long** |  | [optional] 
+**Category** | [**Category**](Category.md) |  | [optional] 
 **Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
index b48f3490005..662fa6f4a38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialModelNameProperty** | **string** |  | [optional] 
 **SpecialPropertyName** | **long** |  | [optional] 
+**SpecialModelNameProperty** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
index 455f031674d..a0f0d223899 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Email** | **string** |  | [optional] 
-**FirstName** | **string** |  | [optional] 
 **Id** | **long** |  | [optional] 
+**Username** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**Email** | **string** |  | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**Username** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index a74ad308ba2..c201ed08dc6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -185,17 +185,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
+        protected virtual ModelClient? OnCall123TestSpecialTags(ModelClient? modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -204,7 +195,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterCall123TestSpecialTags(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
+        protected virtual void AfterCall123TestSpecialTags(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
         {
         }
 
@@ -215,7 +206,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorCall123TestSpecialTags(Exception exception, string pathFormat, string path, ModelClient modelClient)
+        protected virtual void OnErrorCall123TestSpecialTags(Exception exception, string pathFormat, string path, ModelClient? modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -227,7 +218,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
index 8732ee2357c..a6f30afe042 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool?&gt;&gt;</returns>
-        Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -94,7 +94,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool?&gt;</returns>
-        Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -106,7 +106,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;OuterComposite?&gt;&gt;</returns>
-        Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -118,7 +118,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;OuterComposite&gt;</returns>
-        Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -129,7 +129,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;OuterComposite?&gt;</returns>
-        Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -141,7 +141,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal?&gt;&gt;</returns>
-        Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -153,7 +153,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal?&gt;</returns>
-        Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -176,7 +176,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string?&gt;&gt;</returns>
-        Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -188,7 +188,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> FakeOuterStringSerializeAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> FakeOuterStringSerializeAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string?&gt;</returns>
-        Task<string?> FakeOuterStringSerializeOrDefaultAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string?> FakeOuterStringSerializeOrDefaultAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Array of Enums
@@ -243,7 +243,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -255,7 +255,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -266,7 +266,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -275,11 +275,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -288,11 +288,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -300,11 +300,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -316,7 +316,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -328,7 +328,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -339,7 +339,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -348,23 +348,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -373,23 +373,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -397,23 +397,23 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -424,15 +424,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -443,15 +443,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -461,15 +461,15 @@ namespace Org.OpenAPITools.IApi
         /// </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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -478,15 +478,15 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -495,15 +495,15 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -511,15 +511,15 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -531,7 +531,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -543,7 +543,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -554,7 +554,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -567,7 +567,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -580,7 +580,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -592,7 +592,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -608,7 +608,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -624,7 +624,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -639,7 +639,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -853,7 +853,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool?> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -870,7 +870,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool?>? result = null;
             try 
@@ -924,7 +924,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1001,7 +1001,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="OuterComposite"/>&gt;</returns>
-        public async Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<OuterComposite?> result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false);
 
@@ -1018,7 +1018,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="OuterComposite"/>&gt;</returns>
-        public async Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<OuterComposite?>? result = null;
             try 
@@ -1072,7 +1072,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="OuterComposite"/></returns>
-        public async Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1149,7 +1149,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal?> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -1166,7 +1166,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal?>? result = null;
             try 
@@ -1220,7 +1220,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1297,7 +1297,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> FakeOuterStringSerializeAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> FakeOuterStringSerializeAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?> result = await FakeOuterStringSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -1314,7 +1314,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string?> FakeOuterStringSerializeOrDefaultAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string?> FakeOuterStringSerializeOrDefaultAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?>? result = null;
             try 
@@ -1368,7 +1368,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1574,7 +1574,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1591,7 +1591,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1612,17 +1612,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="fileSchemaTestClass"></param>
         /// <returns></returns>
-        protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
+        protected virtual FileSchemaTestClass? OnTestBodyWithFileSchema(FileSchemaTestClass? fileSchemaTestClass)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (fileSchemaTestClass == null)
-                throw new ArgumentNullException(nameof(fileSchemaTestClass));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return fileSchemaTestClass;
         }
 
@@ -1631,7 +1622,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="fileSchemaTestClass"></param>
-        protected virtual void AfterTestBodyWithFileSchema(ApiResponse<object?> apiResponse, FileSchemaTestClass fileSchemaTestClass)
+        protected virtual void AfterTestBodyWithFileSchema(ApiResponse<object?> apiResponse, FileSchemaTestClass? fileSchemaTestClass)
         {
         }
 
@@ -1642,7 +1633,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="fileSchemaTestClass"></param>
-        protected virtual void OnErrorTestBodyWithFileSchema(Exception exception, string pathFormat, string path, FileSchemaTestClass fileSchemaTestClass)
+        protected virtual void OnErrorTestBodyWithFileSchema(Exception exception, string pathFormat, string path, FileSchemaTestClass? fileSchemaTestClass)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1654,7 +1645,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1719,13 +1710,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1737,16 +1728,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1760,33 +1751,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
+        protected virtual (string?, User?) OnTestBodyWithQueryParams(string? query, User? user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (query == null)
-                throw new ArgumentNullException(nameof(query));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, query);
+            return (query, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object?> apiResponse, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object?> apiResponse, string? query, User? user)
         {
         }
 
@@ -1796,9 +1775,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string? query, User? user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1807,19 +1786,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(user, query);
-                user = validatedParameters.Item1;
-                query = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(query, user);
+                query = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1866,7 +1845,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, user, query);
+                            AfterTestBodyWithQueryParams(apiResponse, query, user);
                         }
 
                         return apiResponse;
@@ -1875,7 +1854,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
                 throw;
             }
         }
@@ -1887,7 +1866,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1904,7 +1883,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -1925,17 +1904,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
+        protected virtual ModelClient? OnTestClientModel(ModelClient? modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -1944,7 +1914,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterTestClientModel(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
+        protected virtual void AfterTestClientModel(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
         {
         }
 
@@ -1955,7 +1925,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorTestClientModel(Exception exception, string pathFormat, string path, ModelClient modelClient)
+        protected virtual void OnErrorTestClientModel(Exception exception, string pathFormat, string path, ModelClient? modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1967,7 +1937,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2041,25 +2011,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2071,28 +2041,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object?> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2106,63 +2076,45 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream?, float?, int?, int?, long?, string?, string?, string?, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
+        protected virtual (decimal?, double?, string?, byte[]?, int?, int?, long?, float?, string?, System.IO.Stream?, DateTime?, string?, string?, DateTime?) OnTestEndpointParameters(decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (_byte == null)
-                throw new ArgumentNullException(nameof(_byte));
-
-            if (number == null)
-                throw new ArgumentNullException(nameof(number));
-
-            if (_double == null)
-                throw new ArgumentNullException(nameof(_double));
-
-            if (patternWithoutDelimiter == null)
-                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object?> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object?> apiResponse, decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
         {
         }
 
@@ -2172,21 +2124,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2195,40 +2147,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
-                _byte = validatedParameters.Item1;
-                number = validatedParameters.Item2;
-                _double = validatedParameters.Item3;
-                patternWithoutDelimiter = validatedParameters.Item4;
-                date = validatedParameters.Item5;
-                binary = validatedParameters.Item6;
-                _float = validatedParameters.Item7;
-                integer = validatedParameters.Item8;
-                int32 = validatedParameters.Item9;
-                int64 = validatedParameters.Item10;
-                _string = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                number = validatedParameters.Item1;
+                _double = validatedParameters.Item2;
+                patternWithoutDelimiter = validatedParameters.Item3;
+                _byte = validatedParameters.Item4;
+                integer = validatedParameters.Item5;
+                int32 = validatedParameters.Item6;
+                int64 = validatedParameters.Item7;
+                _float = validatedParameters.Item8;
+                _string = validatedParameters.Item9;
+                binary = validatedParameters.Item10;
+                date = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -2248,10 +2200,6 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
-                    formParams.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(_byte)));
-
-
-
                     formParams.Add(new KeyValuePair<string?, string?>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -2262,14 +2210,9 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string?, string?>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(_float)));
+                    formParams.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(_byte)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string?, string?>("integer", ClientUtils.ParameterToString(integer)));
@@ -2280,9 +2223,18 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string?, string?>("int64", ClientUtils.ParameterToString(int64)));
 
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(_float)));
+
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string?, string?>("string", ClientUtils.ParameterToString(_string)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
+
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date)));
+
                     if (password != null)
                         formParams.Add(new KeyValuePair<string?, string?>("password", ClientUtils.ParameterToString(password)));
 
@@ -2328,7 +2280,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2340,7 +2292,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                 throw;
             }
         }
@@ -2351,17 +2303,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2375,20 +2327,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object?> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2404,16 +2356,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>?, List<string>?, double?, int?, List<string>?, string?, string?, string?) OnTestEnumParameters(List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
+        protected virtual (List<string>?, List<string>?, int?, double?, string?, string?, List<string>?, string?) OnTestEnumParameters(List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -2422,13 +2374,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object?> apiResponse, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object?> apiResponse, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
         {
         }
 
@@ -2440,13 +2392,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2457,28 +2409,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryDouble = validatedParameters.Item3;
-                enumQueryInteger = validatedParameters.Item4;
-                enumFormStringArray = validatedParameters.Item5;
-                enumHeaderString = validatedParameters.Item6;
-                enumQueryString = validatedParameters.Item7;
+                enumQueryInteger = validatedParameters.Item3;
+                enumQueryDouble = validatedParameters.Item4;
+                enumHeaderString = validatedParameters.Item5;
+                enumQueryString = validatedParameters.Item6;
+                enumFormStringArray = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2492,12 +2444,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()!);
 
-                    if (enumQueryDouble != null)
-                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()!);
-
                     if (enumQueryInteger != null)
                         parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()!);
 
+                    if (enumQueryDouble != null)
+                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()!);
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()!);
 
@@ -2549,7 +2501,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                         }
 
                         return apiResponse;
@@ -2558,7 +2510,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 throw;
             }
         }
@@ -2567,17 +2519,17 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2589,20 +2541,20 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2616,44 +2568,29 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <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>
         /// <returns></returns>
-        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual (int?, bool?, long?, int?, bool?, long?) OnTestGroupParameters(int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredBooleanGroup == null)
-                throw new ArgumentNullException(nameof(requiredBooleanGroup));
-
-            if (requiredStringGroup == null)
-                throw new ArgumentNullException(nameof(requiredStringGroup));
-
-            if (requiredInt64Group == null)
-                throw new ArgumentNullException(nameof(requiredInt64Group));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></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>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object?> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object?> apiResponse, int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
         }
 
@@ -2663,13 +2600,13 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2678,26 +2615,26 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
-                requiredBooleanGroup = validatedParameters.Item1;
-                requiredStringGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                requiredStringGroup = validatedParameters.Item1;
+                requiredBooleanGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                booleanGroup = validatedParameters.Item4;
-                stringGroup = validatedParameters.Item5;
+                stringGroup = validatedParameters.Item4;
+                booleanGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2752,7 +2689,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2764,7 +2701,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 throw;
             }
         }
@@ -2776,7 +2713,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2793,7 +2730,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -2814,17 +2751,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="requestBody"></param>
         /// <returns></returns>
-        protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
+        protected virtual Dictionary<string, string>? OnTestInlineAdditionalProperties(Dictionary<string, string>? requestBody)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requestBody == null)
-                throw new ArgumentNullException(nameof(requestBody));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return requestBody;
         }
 
@@ -2833,7 +2761,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="requestBody"></param>
-        protected virtual void AfterTestInlineAdditionalProperties(ApiResponse<object?> apiResponse, Dictionary<string, string> requestBody)
+        protected virtual void AfterTestInlineAdditionalProperties(ApiResponse<object?> apiResponse, Dictionary<string, string>? requestBody)
         {
         }
 
@@ -2844,7 +2772,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="requestBody"></param>
-        protected virtual void OnErrorTestInlineAdditionalProperties(Exception exception, string pathFormat, string path, Dictionary<string, string> requestBody)
+        protected virtual void OnErrorTestInlineAdditionalProperties(Exception exception, string pathFormat, string path, Dictionary<string, string>? requestBody)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2856,7 +2784,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2925,7 +2853,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2943,7 +2871,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -2965,20 +2893,8 @@ namespace Org.OpenAPITools.Api
         /// <param name="param"></param>
         /// <param name="param2"></param>
         /// <returns></returns>
-        protected virtual (string, string) OnTestJsonFormData(string param, string param2)
+        protected virtual (string?, string?) OnTestJsonFormData(string? param, string? param2)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (param == null)
-                throw new ArgumentNullException(nameof(param));
-
-            if (param2 == null)
-                throw new ArgumentNullException(nameof(param2));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (param, param2);
         }
 
@@ -2988,7 +2904,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="param"></param>
         /// <param name="param2"></param>
-        protected virtual void AfterTestJsonFormData(ApiResponse<object?> apiResponse, string param, string param2)
+        protected virtual void AfterTestJsonFormData(ApiResponse<object?> apiResponse, string? param, string? param2)
         {
         }
 
@@ -3000,7 +2916,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="param"></param>
         /// <param name="param2"></param>
-        protected virtual void OnErrorTestJsonFormData(Exception exception, string pathFormat, string path, string param, string param2)
+        protected virtual void OnErrorTestJsonFormData(Exception exception, string pathFormat, string path, string? param, string? param2)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3013,7 +2929,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -3097,7 +3013,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -3118,7 +3034,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -3143,29 +3059,8 @@ namespace Org.OpenAPITools.Api
         /// <param name="url"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
+        protected virtual (List<string>?, List<string>?, List<string>?, List<string>?, List<string>?) OnTestQueryParameterCollectionFormat(List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pipe == null)
-                throw new ArgumentNullException(nameof(pipe));
-
-            if (ioutil == null)
-                throw new ArgumentNullException(nameof(ioutil));
-
-            if (http == null)
-                throw new ArgumentNullException(nameof(http));
-
-            if (url == null)
-                throw new ArgumentNullException(nameof(url));
-
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (pipe, ioutil, http, url, context);
         }
 
@@ -3178,7 +3073,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="http"></param>
         /// <param name="url"></param>
         /// <param name="context"></param>
-        protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse<object?> apiResponse, List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
+        protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse<object?> apiResponse, List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
         {
         }
 
@@ -3193,7 +3088,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="http"></param>
         /// <param name="url"></param>
         /// <param name="context"></param>
-        protected virtual void OnErrorTestQueryParameterCollectionFormat(Exception exception, string pathFormat, string path, List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
+        protected virtual void OnErrorTestQueryParameterCollectionFormat(Exception exception, string pathFormat, string path, List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3209,7 +3104,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 4bdb85c7203..8d7c799073a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -185,17 +185,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient OnTestClassname(ModelClient modelClient)
+        protected virtual ModelClient? OnTestClassname(ModelClient? modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -204,7 +195,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterTestClassname(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
+        protected virtual void AfterTestClassname(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
         {
         }
 
@@ -215,7 +206,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorTestClassname(Exception exception, string pathFormat, string path, ModelClient modelClient)
+        protected virtual void OnErrorTestClassname(Exception exception, string pathFormat, string path, ModelClient? modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -227,7 +218,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
index 0e46e92ad02..584926ff8cf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -88,7 +88,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -100,7 +100,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeletePetOrDefaultAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;?&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -124,7 +124,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;?&gt;</returns>
-        Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;?&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -170,7 +170,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;?&gt;</returns>
-        Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet?&gt;&gt;</returns>
-        Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -194,7 +194,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -205,7 +205,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet?&gt;</returns>
-        Task<Pet?> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet?> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -217,7 +217,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -229,7 +229,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -240,7 +240,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -254,7 +254,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -268,7 +268,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -281,7 +281,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdatePetWithFormOrDefaultAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -291,11 +291,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse?&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -305,11 +305,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -318,11 +318,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse?&gt;</returns>
-        Task<ApiResponse?> UploadFileOrDefaultAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse?> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -331,12 +331,12 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse?&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -345,12 +345,12 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -358,12 +358,12 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse?&gt;</returns>
-        Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -448,7 +448,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -465,7 +465,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -486,17 +486,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="pet"></param>
         /// <returns></returns>
-        protected virtual Pet OnAddPet(Pet pet)
+        protected virtual Pet? OnAddPet(Pet? pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -505,7 +496,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="pet"></param>
-        protected virtual void AfterAddPet(ApiResponse<object?> apiResponse, Pet pet)
+        protected virtual void AfterAddPet(ApiResponse<object?> apiResponse, Pet? pet)
         {
         }
 
@@ -516,7 +507,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="pet"></param>
-        protected virtual void OnErrorAddPet(Exception exception, string pathFormat, string path, Pet pet)
+        protected virtual void OnErrorAddPet(Exception exception, string pathFormat, string path, Pet? pet)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -528,7 +519,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -620,7 +611,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -638,7 +629,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeletePetOrDefaultAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -660,17 +651,8 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
         /// <returns></returns>
-        protected virtual (long, string?) OnDeletePet(long petId, string? apiKey)
+        protected virtual (long?, string?) OnDeletePet(long? petId, string? apiKey)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, apiKey);
         }
 
@@ -680,7 +662,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
-        protected virtual void AfterDeletePet(ApiResponse<object?> apiResponse, long petId, string? apiKey)
+        protected virtual void AfterDeletePet(ApiResponse<object?> apiResponse, long? petId, string? apiKey)
         {
         }
 
@@ -692,7 +674,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
-        protected virtual void OnErrorDeletePet(Exception exception, string pathFormat, string path, long petId, string? apiKey)
+        protected virtual void OnErrorDeletePet(Exception exception, string pathFormat, string path, long? petId, string? apiKey)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -705,7 +687,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -776,7 +758,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -793,7 +775,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?>? result = null;
             try 
@@ -814,17 +796,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="status"></param>
         /// <returns></returns>
-        protected virtual List<string> OnFindPetsByStatus(List<string> status)
+        protected virtual List<string>? OnFindPetsByStatus(List<string>? status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (status == null)
-                throw new ArgumentNullException(nameof(status));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return status;
         }
 
@@ -833,7 +806,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="status"></param>
-        protected virtual void AfterFindPetsByStatus(ApiResponse<List<Pet>?> apiResponse, List<string> status)
+        protected virtual void AfterFindPetsByStatus(ApiResponse<List<Pet>?> apiResponse, List<string>? status)
         {
         }
 
@@ -844,7 +817,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="status"></param>
-        protected virtual void OnErrorFindPetsByStatus(Exception exception, string pathFormat, string path, List<string> status)
+        protected virtual void OnErrorFindPetsByStatus(Exception exception, string pathFormat, string path, List<string>? status)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -856,7 +829,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -949,7 +922,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -966,7 +939,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?>? result = null;
             try 
@@ -987,17 +960,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="tags"></param>
         /// <returns></returns>
-        protected virtual List<string> OnFindPetsByTags(List<string> tags)
+        protected virtual List<string>? OnFindPetsByTags(List<string>? tags)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (tags == null)
-                throw new ArgumentNullException(nameof(tags));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return tags;
         }
 
@@ -1006,7 +970,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="tags"></param>
-        protected virtual void AfterFindPetsByTags(ApiResponse<List<Pet>?> apiResponse, List<string> tags)
+        protected virtual void AfterFindPetsByTags(ApiResponse<List<Pet>?> apiResponse, List<string>? tags)
         {
         }
 
@@ -1017,7 +981,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="tags"></param>
-        protected virtual void OnErrorFindPetsByTags(Exception exception, string pathFormat, string path, List<string> tags)
+        protected virtual void OnErrorFindPetsByTags(Exception exception, string pathFormat, string path, List<string>? tags)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1029,7 +993,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1122,7 +1086,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet?> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -1139,7 +1103,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet?> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet?> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet?>? result = null;
             try 
@@ -1160,17 +1124,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="petId"></param>
         /// <returns></returns>
-        protected virtual long OnGetPetById(long petId)
+        protected virtual long? OnGetPetById(long? petId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return petId;
         }
 
@@ -1179,7 +1134,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        protected virtual void AfterGetPetById(ApiResponse<Pet?> apiResponse, long petId)
+        protected virtual void AfterGetPetById(ApiResponse<Pet?> apiResponse, long? petId)
         {
         }
 
@@ -1190,7 +1145,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        protected virtual void OnErrorGetPetById(Exception exception, string pathFormat, string path, long petId)
+        protected virtual void OnErrorGetPetById(Exception exception, string pathFormat, string path, long? petId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1202,7 +1157,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1276,7 +1231,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1293,7 +1248,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1314,17 +1269,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="pet"></param>
         /// <returns></returns>
-        protected virtual Pet OnUpdatePet(Pet pet)
+        protected virtual Pet? OnUpdatePet(Pet? pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -1333,7 +1279,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="pet"></param>
-        protected virtual void AfterUpdatePet(ApiResponse<object?> apiResponse, Pet pet)
+        protected virtual void AfterUpdatePet(ApiResponse<object?> apiResponse, Pet? pet)
         {
         }
 
@@ -1344,7 +1290,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="pet"></param>
-        protected virtual void OnErrorUpdatePet(Exception exception, string pathFormat, string path, Pet pet)
+        protected virtual void OnErrorUpdatePet(Exception exception, string pathFormat, string path, Pet? pet)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1356,7 +1302,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1449,7 +1395,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1468,7 +1414,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> UpdatePetWithFormOrDefaultAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1491,17 +1437,8 @@ namespace Org.OpenAPITools.Api
         /// <param name="name"></param>
         /// <param name="status"></param>
         /// <returns></returns>
-        protected virtual (long, string?, string?) OnUpdatePetWithForm(long petId, string? name, string? status)
+        protected virtual (long?, string?, string?) OnUpdatePetWithForm(long? petId, string? name, string? status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, name, status);
         }
 
@@ -1512,7 +1449,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="name"></param>
         /// <param name="status"></param>
-        protected virtual void AfterUpdatePetWithForm(ApiResponse<object?> apiResponse, long petId, string? name, string? status)
+        protected virtual void AfterUpdatePetWithForm(ApiResponse<object?> apiResponse, long? petId, string? name, string? status)
         {
         }
 
@@ -1525,7 +1462,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="name"></param>
         /// <param name="status"></param>
-        protected virtual void OnErrorUpdatePetWithForm(Exception exception, string pathFormat, string path, long petId, string? name, string? status)
+        protected virtual void OnErrorUpdatePetWithForm(Exception exception, string pathFormat, string path, long? petId, string? name, string? status)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1539,7 +1476,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1627,13 +1564,13 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse?> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse?> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1646,16 +1583,16 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse?> UploadFileOrDefaultAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse?> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse?>? result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1670,21 +1607,12 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        protected virtual (long, System.IO.Stream?, string?) OnUploadFile(long petId, System.IO.Stream? file, string? additionalMetadata)
+        protected virtual (long?, string?, System.IO.Stream?) OnUploadFile(long? petId, string? additionalMetadata, System.IO.Stream? file)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (petId, file, additionalMetadata);
+            return (petId, additionalMetadata, file);
         }
 
         /// <summary>
@@ -1692,9 +1620,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse?> apiResponse, long petId, System.IO.Stream? file, string? additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse?> apiResponse, long? petId, string? additionalMetadata, System.IO.Stream? file)
         {
         }
 
@@ -1705,9 +1633,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream? file, string? additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long? petId, string? additionalMetadata, System.IO.Stream? file)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1717,20 +1645,20 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
+                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
                 petId = validatedParameters.Item1;
-                file = validatedParameters.Item2;
-                additionalMetadata = validatedParameters.Item3;
+                additionalMetadata = validatedParameters.Item2;
+                file = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1745,12 +1673,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string?, string?>> formParams = new List<KeyValuePair<string?, string?>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
-                        multipartContent.Add(new StreamContent(file));
-
-                    if (additionalMetadata != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
                         formParams.Add(new KeyValuePair<string?, string?>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
 
+                    if (file != null)
+                        multipartContent.Add(new StreamContent(file));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1796,7 +1724,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
+                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1808,7 +1736,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
                 throw;
             }
         }
@@ -1817,14 +1745,14 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse?> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse?> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1836,17 +1764,17 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse?>? result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1860,35 +1788,23 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (System.IO.Stream, long, string?) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string? additionalMetadata)
+        protected virtual (long?, System.IO.Stream?, string?) OnUploadFileWithRequiredFile(long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredFile == null)
-                throw new ArgumentNullException(nameof(requiredFile));
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredFile, petId, additionalMetadata);
+            return (petId, requiredFile, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse?> apiResponse, System.IO.Stream requiredFile, long petId, string? additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse?> apiResponse, long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
         {
         }
 
@@ -1898,10 +1814,10 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string? additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1910,20 +1826,20 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
-                requiredFile = validatedParameters.Item1;
-                petId = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                petId = validatedParameters.Item1;
+                requiredFile = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1990,7 +1906,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2002,7 +1918,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
index de9a6972e9e..f6e1731d770 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -106,7 +106,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order?&gt;&gt;</returns>
-        Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -118,7 +118,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -129,7 +129,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order?&gt;</returns>
-        Task<Order?> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order?> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -141,7 +141,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order?&gt;&gt;</returns>
-        Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -153,7 +153,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order?&gt;</returns>
-        Task<Order?> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order?> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -249,7 +249,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -266,7 +266,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -287,17 +287,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        protected virtual string OnDeleteOrder(string orderId)
+        protected virtual string? OnDeleteOrder(string? orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -306,7 +297,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="orderId"></param>
-        protected virtual void AfterDeleteOrder(ApiResponse<object?> apiResponse, string orderId)
+        protected virtual void AfterDeleteOrder(ApiResponse<object?> apiResponse, string? orderId)
         {
         }
 
@@ -317,7 +308,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="orderId"></param>
-        protected virtual void OnErrorDeleteOrder(Exception exception, string pathFormat, string path, string orderId)
+        protected virtual void OnErrorDeleteOrder(Exception exception, string pathFormat, string path, string? orderId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -329,7 +320,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -522,7 +513,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -539,7 +530,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order?> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order?> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?>? result = null;
             try 
@@ -560,17 +551,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        protected virtual long OnGetOrderById(long orderId)
+        protected virtual long? OnGetOrderById(long? orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -579,7 +561,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="orderId"></param>
-        protected virtual void AfterGetOrderById(ApiResponse<Order?> apiResponse, long orderId)
+        protected virtual void AfterGetOrderById(ApiResponse<Order?> apiResponse, long? orderId)
         {
         }
 
@@ -590,7 +572,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="orderId"></param>
-        protected virtual void OnErrorGetOrderById(Exception exception, string pathFormat, string path, long orderId)
+        protected virtual void OnErrorGetOrderById(Exception exception, string pathFormat, string path, long? orderId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -602,7 +584,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -667,7 +649,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -684,7 +666,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order?> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order?> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?>? result = null;
             try 
@@ -705,17 +687,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="order"></param>
         /// <returns></returns>
-        protected virtual Order OnPlaceOrder(Order order)
+        protected virtual Order? OnPlaceOrder(Order? order)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (order == null)
-                throw new ArgumentNullException(nameof(order));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return order;
         }
 
@@ -724,7 +697,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="order"></param>
-        protected virtual void AfterPlaceOrder(ApiResponse<Order?> apiResponse, Order order)
+        protected virtual void AfterPlaceOrder(ApiResponse<Order?> apiResponse, Order? order)
         {
         }
 
@@ -735,7 +708,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="order"></param>
-        protected virtual void OnErrorPlaceOrder(Exception exception, string pathFormat, string path, Order order)
+        protected virtual void OnErrorPlaceOrder(Exception exception, string pathFormat, string path, Order? order)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -747,7 +720,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
index d6d3548d8aa..375f882d5a5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -74,7 +74,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -86,7 +86,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -132,7 +132,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -144,7 +144,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -156,7 +156,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -167,7 +167,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -179,7 +179,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User?&gt;&gt;</returns>
-        Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -191,7 +191,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -202,7 +202,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User?&gt;</returns>
-        Task<User?> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User?> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -215,7 +215,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string?&gt;&gt;</returns>
-        Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -228,7 +228,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -240,7 +240,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string?&gt;</returns>
-        Task<string?> LoginUserOrDefaultAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string?> LoginUserOrDefaultAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -281,11 +281,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -294,11 +294,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -306,11 +306,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -395,7 +395,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -412,7 +412,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -433,17 +433,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual User OnCreateUser(User user)
+        protected virtual User? OnCreateUser(User? user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -452,7 +443,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUser(ApiResponse<object?> apiResponse, User user)
+        protected virtual void AfterCreateUser(ApiResponse<object?> apiResponse, User? user)
         {
         }
 
@@ -463,7 +454,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUser(Exception exception, string pathFormat, string path, User user)
+        protected virtual void OnErrorCreateUser(Exception exception, string pathFormat, string path, User? user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -475,7 +466,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -543,7 +534,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -560,7 +551,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -581,17 +572,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
+        protected virtual List<User>? OnCreateUsersWithArrayInput(List<User>? user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -600,7 +582,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUsersWithArrayInput(ApiResponse<object?> apiResponse, List<User> user)
+        protected virtual void AfterCreateUsersWithArrayInput(ApiResponse<object?> apiResponse, List<User>? user)
         {
         }
 
@@ -611,7 +593,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUsersWithArrayInput(Exception exception, string pathFormat, string path, List<User> user)
+        protected virtual void OnErrorCreateUsersWithArrayInput(Exception exception, string pathFormat, string path, List<User>? user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -623,7 +605,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -691,7 +673,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -708,7 +690,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -729,17 +711,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
+        protected virtual List<User>? OnCreateUsersWithListInput(List<User>? user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -748,7 +721,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUsersWithListInput(ApiResponse<object?> apiResponse, List<User> user)
+        protected virtual void AfterCreateUsersWithListInput(ApiResponse<object?> apiResponse, List<User>? user)
         {
         }
 
@@ -759,7 +732,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUsersWithListInput(Exception exception, string pathFormat, string path, List<User> user)
+        protected virtual void OnErrorCreateUsersWithListInput(Exception exception, string pathFormat, string path, List<User>? user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -771,7 +744,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -839,7 +812,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -856,7 +829,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -877,17 +850,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual string OnDeleteUser(string username)
+        protected virtual string? OnDeleteUser(string? username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -896,7 +860,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
-        protected virtual void AfterDeleteUser(ApiResponse<object?> apiResponse, string username)
+        protected virtual void AfterDeleteUser(ApiResponse<object?> apiResponse, string? username)
         {
         }
 
@@ -907,7 +871,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorDeleteUser(Exception exception, string pathFormat, string path, string username)
+        protected virtual void OnErrorDeleteUser(Exception exception, string pathFormat, string path, string? username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -919,7 +883,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -974,7 +938,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User?> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -991,7 +955,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User?> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User?> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User?>? result = null;
             try 
@@ -1012,17 +976,8 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual string OnGetUserByName(string username)
+        protected virtual string? OnGetUserByName(string? username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -1031,7 +986,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
-        protected virtual void AfterGetUserByName(ApiResponse<User?> apiResponse, string username)
+        protected virtual void AfterGetUserByName(ApiResponse<User?> apiResponse, string? username)
         {
         }
 
@@ -1042,7 +997,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorGetUserByName(Exception exception, string pathFormat, string path, string username)
+        protected virtual void OnErrorGetUserByName(Exception exception, string pathFormat, string path, string? username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1054,7 +1009,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1120,7 +1075,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1138,7 +1093,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string?> LoginUserOrDefaultAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string?> LoginUserOrDefaultAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?>? result = null;
             try 
@@ -1160,20 +1115,8 @@ namespace Org.OpenAPITools.Api
         /// <param name="username"></param>
         /// <param name="password"></param>
         /// <returns></returns>
-        protected virtual (string, string) OnLoginUser(string username, string password)
+        protected virtual (string?, string?) OnLoginUser(string? username, string? password)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            if (password == null)
-                throw new ArgumentNullException(nameof(password));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (username, password);
         }
 
@@ -1183,7 +1126,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
         /// <param name="password"></param>
-        protected virtual void AfterLoginUser(ApiResponse<string?> apiResponse, string username, string password)
+        protected virtual void AfterLoginUser(ApiResponse<string?> apiResponse, string? username, string? password)
         {
         }
 
@@ -1195,7 +1138,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="username"></param>
         /// <param name="password"></param>
-        protected virtual void OnErrorLoginUser(Exception exception, string pathFormat, string path, string username, string password)
+        protected virtual void OnErrorLoginUser(Exception exception, string pathFormat, string path, string? username, string? password)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1208,7 +1151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1399,13 +1342,13 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1417,16 +1360,16 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1440,33 +1383,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnUpdateUser(User user, string username)
+        protected virtual (string?, User?) OnUpdateUser(string? username, User? user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, username);
+            return (username, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object?> apiResponse, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object?> apiResponse, string? username, User? user)
         {
         }
 
@@ -1476,9 +1407,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string? username, User? user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1487,19 +1418,19 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(user, username);
-                user = validatedParameters.Item1;
-                username = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(username, user);
+                username = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1540,7 +1471,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, user, username);
+                            AfterUpdateUser(apiResponse, username, user);
                         }
 
                         return apiResponse;
@@ -1549,7 +1480,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/IApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/IApi.cs
new file mode 100644
index 00000000000..038f19bcfa1
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/IApi.cs
@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+namespace Org.OpenAPITools.IApi
+{
+    /// <summary>
+    /// Any Api client
+    /// </summary>
+    public interface IApi
+    {
+        /// <summary>
+        /// The HttpClient
+        /// </summary>
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
new file mode 100644
index 00000000000..a5253e58201
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
@@ -0,0 +1,29 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using Newtonsoft.Json.Converters;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class OpenAPIDateConverter : IsoDateTimeConverter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenAPIDateConverter" /> class.
+        /// </summary>
+        public OpenAPIDateConverter()
+        {
+            // full-date   = date-fullyear "-" date-month "-" date-mday
+            DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 2bdee7f21c5..03e3c65016d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -33,16 +33,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
         /// <param name="mapProperty">mapProperty</param>
+        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
+        /// <param name="anytype1">anytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
-        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object? anytype1 = default)
+        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object? anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -71,22 +71,21 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EmptyMap = emptyMap;
-            MapOfMapProperty = mapOfMapProperty;
             MapProperty = mapProperty;
+            MapOfMapProperty = mapOfMapProperty;
+            Anytype1 = anytype1;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
+            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
-            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
+        /// Gets or Sets MapProperty
         /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -95,10 +94,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets Anytype1
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        [JsonPropertyName("anytype_1")]
+        public Object? Anytype1 { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -119,16 +118,17 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapWithUndeclaredPropertiesString
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_with_undeclared_properties_string")]
-        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object? Anytype1 { get; set; }
+        [JsonPropertyName("map_with_undeclared_properties_string")]
+        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -144,14 +144,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
             sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -189,14 +189,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Object emptyMap = default;
-            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
             Dictionary<string, string> mapProperty = default;
+            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
+            Object anytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
+            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
-            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -213,14 +213,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -231,19 +231,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
+            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
         }
 
         /// <summary>
@@ -257,22 +257,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
-            writer.WritePropertyName("map_of_map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
             writer.WritePropertyName("map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("map_of_map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
index 9e9334983bf..6a903337499 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -34,10 +34,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="message">message</param>
         /// <param name="type">type</param>
+        /// <param name="message">message</param>
         [JsonConstructor]
-        public ApiResponse(int code, string message, string type)
+        public ApiResponse(int code, string type, string message)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Message = message;
             Type = type;
+            Message = message;
         }
 
         /// <summary>
@@ -65,18 +65,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Message
-        /// </summary>
-        [JsonPropertyName("message")]
-        public string Message { get; set; }
-
         /// <summary>
         /// Gets or Sets Type
         /// </summary>
         [JsonPropertyName("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Message
+        /// </summary>
+        [JsonPropertyName("message")]
+        public string Message { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -92,8 +92,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -132,8 +132,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string message = default;
             string type = default;
+            string message = default;
 
             while (reader.Read())
             {
@@ -153,19 +153,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "message":
-                            message = reader.GetString();
-                            break;
                         case "type":
                             type = reader.GetString();
                             break;
+                        case "message":
+                            message = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, message, type);
+            return new ApiResponse(code, type, message);
         }
 
         /// <summary>
@@ -180,8 +180,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("message", apiResponse.Message);
             writer.WriteString("type", apiResponse.Type);
+            writer.WriteString("message", apiResponse.Message);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
index 95286c8847a..34598f70f3c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
+        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
-        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
+        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,11 +54,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
-            ArrayOfString = arrayOfString;
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -71,12 +77,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
-            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
+            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
         }
 
         /// <summary>
@@ -179,12 +179,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
index 7b2728c1e73..10fd0d010c7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -33,14 +33,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
         /// <param name="capitalCamel">capitalCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="smallCamel">smallCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         [JsonConstructor]
-        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
+        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -66,20 +66,19 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
             CapitalCamel = capitalCamel;
+            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            SmallCamel = smallCamel;
-            SmallSnake = smallSnake;
+            ATT_NAME = aTTNAME;
         }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -87,6 +86,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
+
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -100,16 +105,11 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
-        /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
-
-        /// <summary>
-        /// Gets or Sets SmallSnake
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -125,12 +125,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -168,12 +168,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string aTTNAME = default;
+            string smallCamel = default;
             string capitalCamel = default;
+            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string smallCamel = default;
-            string smallSnake = default;
+            string aTTNAME = default;
 
             while (reader.Read())
             {
@@ -190,23 +190,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
+                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
-                            break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         default:
                             break;
@@ -214,7 +214,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
+            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
         }
 
         /// <summary>
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
index 1ed872ebd7f..e22023c0877 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="id">id</param>
         /// <param name="name">name (default to &quot;default-name&quot;)</param>
+        /// <param name="id">id</param>
         [JsonConstructor]
-        public Category(long id, string name = "default-name")
+        public Category(string name = "default-name", long id)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -50,22 +50,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
             Name = name;
+            Id = id;
         }
 
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
             string name = default;
+            long id = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(id, name);
+            return new Category(name, id);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", category.Id);
             writer.WriteString("name", category.Name);
+            writer.WriteNumber("id", category.Id);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
index 1c5262054dc..1319b9dce38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public ClassModel(string classProperty)
+        public ClassModel(string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
+            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets ClassProperty
+        /// Gets or Sets Class
         /// </summary>
         [JsonPropertyName("_class")]
-        public string ClassProperty { get; set; }
+        public string Class { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            classProperty = reader.GetString();
+                            _class = reader.GetString();
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(classProperty);
+            return new ClassModel(_class);
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.ClassProperty);
+            writer.WriteString("_class", classModel.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
index 72a19246c84..d5cc7274af1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
@@ -35,10 +35,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="shapes">shapes</param>
         /// <param name="nullableShape">nullableShape</param>
+        /// <param name="shapes">shapes</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape? nullableShape = default) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape? nullableShape = default, List<Shape> shapes) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            Shapes = shapes;
             NullableShape = nullableShape;
+            Shapes = shapes;
         }
 
         /// <summary>
@@ -73,18 +73,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Shapes
-        /// </summary>
-        [JsonPropertyName("shapes")]
-        public List<Shape> Shapes { get; set; }
-
         /// <summary>
         /// Gets or Sets NullableShape
         /// </summary>
         [JsonPropertyName("nullableShape")]
         public NullableShape? NullableShape { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Shapes
+        /// </summary>
+        [JsonPropertyName("shapes")]
+        public List<Shape> Shapes { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -96,8 +96,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
+            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -136,8 +136,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            List<Shape> shapes = default;
             NullableShape nullableShape = default;
+            List<Shape> shapes = default;
 
             while (reader.Read())
             {
@@ -160,19 +160,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "shapes":
-                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
-                            break;
                         case "nullableShape":
                             nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
                             break;
+                        case "shapes":
+                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
+            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
         }
 
         /// <summary>
@@ -190,10 +190,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("shapes");
-            JsonSerializer.Serialize(writer, drawing.Shapes, options);
             writer.WritePropertyName("nullableShape");
             JsonSerializer.Serialize(writer, drawing.NullableShape, options);
+            writer.WritePropertyName("shapes");
+            JsonSerializer.Serialize(writer, drawing.Shapes, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
index 8040834df48..a7a0dbec514 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="arrayEnum">arrayEnum</param>
         /// <param name="justSymbol">justSymbol</param>
+        /// <param name="arrayEnum">arrayEnum</param>
         [JsonConstructor]
-        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
+        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -50,41 +50,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayEnum = arrayEnum;
             JustSymbol = justSymbol;
+            ArrayEnum = arrayEnum;
         }
 
         /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -93,48 +93,54 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Gets or Sets JustSymbol
         /// </summary>
-        public enum JustSymbolEnum
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
+        /// <summary>
+        /// Defines ArrayEnum
+        /// </summary>
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -143,23 +149,17 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -180,8 +180,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
+            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -219,8 +219,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
             EnumArrays.JustSymbolEnum justSymbol = default;
+            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
 
             while (reader.Read())
             {
@@ -237,20 +237,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(arrayEnum, justSymbol);
+            return new EnumArrays(justSymbol, arrayEnum);
         }
 
         /// <summary>
@@ -264,13 +264,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
index e0b83aafe4d..d71fc4232a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -33,17 +33,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
+        /// <param name="enumStringRequired">enumStringRequired</param>
+        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="enumString">enumString</param>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
-        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
+        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -75,48 +75,56 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            EnumStringRequired = enumStringRequired;
+            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            EnumString = enumString;
-            EnumStringRequired = enumStringRequired;
-            OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnum = outerEnum;
             OuterEnumInteger = outerEnumInteger;
+            OuterEnumDefaultValue = outerEnumDefaultValue;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
-            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -125,48 +133,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            return (int) value;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -175,48 +200,57 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -225,62 +259,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
-
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -289,65 +309,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            Lower = 2,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -356,31 +359,28 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
 
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
+        /// Gets or Sets OuterEnum
         /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -389,16 +389,16 @@ namespace Org.OpenAPITools.Model
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumIntegerDefaultValue
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnumIntegerDefaultValue")]
-        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumIntegerDefaultValue")]
+        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -414,15 +414,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -460,15 +460,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
+            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            EnumTest.EnumStringEnum enumString = default;
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnum? outerEnum = default;
             OuterEnumInteger outerEnumInteger = default;
+            OuterEnumDefaultValue outerEnumDefaultValue = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
-            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -485,6 +485,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                            break;
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -494,37 +502,29 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
-                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
+            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
         }
 
         /// <summary>
@@ -538,41 +538,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
-            if (enumStringRawValue != null)
-                writer.WriteString("enum_string", enumStringRawValue);
-            else
-                writer.WriteNull("enum_string");
             var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
             if (enumStringRequiredRawValue != null)
                 writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
                 writer.WriteNull("enum_string_required");
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
-            if (outerEnumDefaultValueRawValue != null)
-                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
+            if (enumStringRawValue != null)
+                writer.WriteString("enum_string", enumStringRawValue);
             else
-                writer.WriteNull("outerEnumDefaultValue");
+                writer.WriteNull("enum_string");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
             var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
             if (outerEnumIntegerRawValue != null)
                 writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
             else
                 writer.WriteNull("outerEnumInteger");
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            if (outerEnumDefaultValueRawValue != null)
+                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            else
+                writer.WriteNull("outerEnumDefaultValue");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index a78484e9493..68b38dc2b18 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="_string">_string</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo stringProperty)
+        public FooGetDefaultResponse(Foo _string)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            StringProperty = stringProperty;
+            String = _string;
         }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets String
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo StringProperty { get; set; }
+        public Foo String { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo stringProperty = default;
+            Foo _string = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(stringProperty);
+            return new FooGetDefaultResponse(_string);
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
index 56c91e4bf74..617d1471741 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -33,24 +33,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="binary">binary</param>
-        /// <param name="byteProperty">byteProperty</param>
+        /// <param name="number">number</param>
+        /// <param name="_byte">_byte</param>
         /// <param name="date">date</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="decimalProperty">decimalProperty</param>
-        /// <param name="doubleProperty">doubleProperty</param>
-        /// <param name="floatProperty">floatProperty</param>
+        /// <param name="password">password</param>
+        /// <param name="integer">integer</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="integer">integer</param>
-        /// <param name="number">number</param>
-        /// <param name="password">password</param>
+        /// <param name="_float">_float</param>
+        /// <param name="_double">_double</param>
+        /// <param name="_decimal">_decimal</param>
+        /// <param name="_string">_string</param>
+        /// <param name="binary">binary</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="uuid">uuid</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
-        /// <param name="stringProperty">stringProperty</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
+        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -67,20 +67,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (floatProperty == null)
-                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
+            if (_float == null)
+                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
 
-            if (doubleProperty == null)
-                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
+            if (_double == null)
+                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
 
-            if (decimalProperty == null)
-                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
+            if (_decimal == null)
+                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
 
-            if (byteProperty == null)
-                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
+            if (_byte == null)
+                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -106,35 +106,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Binary = binary;
-            ByteProperty = byteProperty;
+            Number = number;
+            Byte = _byte;
             Date = date;
-            DateTime = dateTime;
-            DecimalProperty = decimalProperty;
-            DoubleProperty = doubleProperty;
-            FloatProperty = floatProperty;
+            Password = password;
+            Integer = integer;
             Int32 = int32;
             Int64 = int64;
-            Integer = integer;
-            Number = number;
-            Password = password;
+            Float = _float;
+            Double = _double;
+            Decimal = _decimal;
+            String = _string;
+            Binary = binary;
+            DateTime = dateTime;
+            Uuid = uuid;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
-            StringProperty = stringProperty;
-            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets ByteProperty
+        /// Gets or Sets Byte
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] ByteProperty { get; set; }
+        public byte[] Byte { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -143,28 +143,16 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
-        /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DecimalProperty
-        /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal DecimalProperty { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DoubleProperty
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("double")]
-        public double DoubleProperty { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
-        /// Gets or Sets FloatProperty
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("float")]
-        public float FloatProperty { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
         /// Gets or Sets Int32
@@ -179,42 +167,40 @@ namespace Org.OpenAPITools.Model
         public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets Float
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
+        [JsonPropertyName("float")]
+        public float Float { get; set; }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Double
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("double")]
+        public double Double { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets Decimal
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal Decimal { get; set; }
 
         /// <summary>
-        /// A string that is a 10 digit number. Can have leading zeros.
+        /// Gets or Sets String
         /// </summary>
-        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
-        [JsonPropertyName("pattern_with_digits")]
-        public string PatternWithDigits { get; set; }
+        [JsonPropertyName("string")]
+        public string String { get; set; }
 
         /// <summary>
-        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// Gets or Sets Binary
         /// </summary>
-        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
-        [JsonPropertyName("pattern_with_digits_and_delimiter")]
-        public string PatternWithDigitsAndDelimiter { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("string")]
-        public string StringProperty { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
         /// Gets or Sets Uuid
@@ -222,6 +208,20 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("uuid")]
         public Guid Uuid { get; set; }
 
+        /// <summary>
+        /// A string that is a 10 digit number. Can have leading zeros.
+        /// </summary>
+        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
+        [JsonPropertyName("pattern_with_digits")]
+        public string PatternWithDigits { get; set; }
+
+        /// <summary>
+        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// </summary>
+        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
+        [JsonPropertyName("pattern_with_digits_and_delimiter")]
+        public string PatternWithDigitsAndDelimiter { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -236,22 +236,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Byte: ").Append(Byte).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
-            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
-            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Float: ").Append(Float).Append("\n");
+            sb.Append("  Double: ").Append(Double).Append("\n");
+            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -263,28 +263,40 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // DoubleProperty (double) maximum
-            if (this.DoubleProperty > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+            }
+
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+            }
+
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
             }
 
-            // DoubleProperty (double) minimum
-            if (this.DoubleProperty < (double)67.8)
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
-            // FloatProperty (float) maximum
-            if (this.FloatProperty > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // FloatProperty (float) minimum
-            if (this.FloatProperty < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
             // Int32 (int) maximum
@@ -299,40 +311,35 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // Float (float) maximum
+            if (this.Float > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // Float (float) minimum
+            if (this.Float < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
             }
 
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
+            // Double (double) maximum
+            if (this.Double > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
             }
 
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // Double (double) minimum
+            if (this.Double < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
             }
 
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
-            }
-
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // String (string) pattern
+            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexString.Match(this.String).Success)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
             }
 
             // PatternWithDigits (string) pattern
@@ -349,13 +356,6 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
-            // StringProperty (string) pattern
-            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexStringProperty.Match(this.StringProperty).Success)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
-            }
-
             yield break;
         }
     }
@@ -382,22 +382,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            System.IO.Stream binary = default;
-            byte[] byteProperty = default;
+            decimal number = default;
+            byte[] _byte = default;
             DateTime date = default;
-            DateTime dateTime = default;
-            decimal decimalProperty = default;
-            double doubleProperty = default;
-            float floatProperty = default;
+            string password = default;
+            int integer = default;
             int int32 = default;
             long int64 = default;
-            int integer = default;
-            decimal number = default;
-            string password = default;
+            float _float = default;
+            double _double = default;
+            decimal _decimal = default;
+            string _string = default;
+            System.IO.Stream binary = default;
+            DateTime dateTime = default;
+            Guid uuid = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
-            string stringProperty = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -414,26 +414,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
                         case "byte":
-                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
-                            break;
-                        case "decimal":
-                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "double":
-                            doubleProperty = reader.GetDouble();
+                        case "password":
+                            password = reader.GetString();
                             break;
-                        case "float":
-                            floatProperty = (float)reader.GetDouble();
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -441,34 +435,40 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "float":
+                            _float = (float)reader.GetDouble();
                             break;
-                        case "number":
-                            number = reader.GetInt32();
+                        case "double":
+                            _double = reader.GetDouble();
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "decimal":
+                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
                             break;
-                        case "pattern_with_digits":
-                            patternWithDigits = reader.GetString();
+                        case "string":
+                            _string = reader.GetString();
                             break;
-                        case "pattern_with_digits_and_delimiter":
-                            patternWithDigitsAndDelimiter = reader.GetString();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
-                        case "string":
-                            stringProperty = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "uuid":
                             uuid = reader.GetGuid();
                             break;
+                        case "pattern_with_digits":
+                            patternWithDigits = reader.GetString();
+                            break;
+                        case "pattern_with_digits_and_delimiter":
+                            patternWithDigitsAndDelimiter = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
+            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
         }
 
         /// <summary>
@@ -482,27 +482,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WriteNumber("number", formatTest.Number);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
+            JsonSerializer.Serialize(writer, formatTest.Byte, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WritePropertyName("dateTime");
-            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
-            writer.WriteNumber("double", formatTest.DoubleProperty);
-            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("integer", formatTest.Integer);
             writer.WriteNumber("int32", formatTest.Int32);
             writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("number", formatTest.Number);
-            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("float", formatTest.Float);
+            writer.WriteNumber("double", formatTest.Double);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
+            writer.WriteString("string", formatTest.String);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WritePropertyName("dateTime");
+            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
+            writer.WriteString("uuid", formatTest.Uuid);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
-            writer.WriteString("string", formatTest.StringProperty);
-            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
index 750572e0098..c3a0a5e83c1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
@@ -33,12 +33,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="directMap">directMap</param>
-        /// <param name="indirectMap">indirectMap</param>
         /// <param name="mapMapOfString">mapMapOfString</param>
         /// <param name="mapOfEnumString">mapOfEnumString</param>
+        /// <param name="directMap">directMap</param>
+        /// <param name="indirectMap">indirectMap</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
+        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,10 +58,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            DirectMap = directMap;
-            IndirectMap = indirectMap;
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
+            DirectMap = directMap;
+            IndirectMap = indirectMap;
         }
 
         /// <summary>
@@ -114,18 +114,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets DirectMap
-        /// </summary>
-        [JsonPropertyName("direct_map")]
-        public Dictionary<string, bool> DirectMap { get; set; }
-
-        /// <summary>
-        /// Gets or Sets IndirectMap
-        /// </summary>
-        [JsonPropertyName("indirect_map")]
-        public Dictionary<string, bool> IndirectMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
@@ -138,6 +126,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_of_enum_string")]
         public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets DirectMap
+        /// </summary>
+        [JsonPropertyName("direct_map")]
+        public Dictionary<string, bool> DirectMap { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IndirectMap
+        /// </summary>
+        [JsonPropertyName("indirect_map")]
+        public Dictionary<string, bool> IndirectMap { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -152,10 +152,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
-            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
             sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
+            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
+            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -193,10 +193,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, bool> directMap = default;
-            Dictionary<string, bool> indirectMap = default;
             Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
             Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
+            Dictionary<string, bool> directMap = default;
+            Dictionary<string, bool> indirectMap = default;
 
             while (reader.Read())
             {
@@ -213,25 +213,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "direct_map":
-                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
-                        case "indirect_map":
-                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
                         case "map_map_of_string":
                             mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
                         case "map_of_enum_string":
                             mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
                             break;
+                        case "direct_map":
+                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
+                        case "indirect_map":
+                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
+            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
         }
 
         /// <summary>
@@ -245,14 +245,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("direct_map");
-            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
-            writer.WritePropertyName("indirect_map");
-            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
             writer.WritePropertyName("map_map_of_string");
             JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
             writer.WritePropertyName("map_of_enum_string");
             JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
+            writer.WritePropertyName("direct_map");
+            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
+            writer.WritePropertyName("indirect_map");
+            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 9086f808663..606c164d8a8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
+        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
+        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,11 +54,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
-            Uuid = uuid;
         }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -71,12 +77,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
+            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
         }
 
         /// <summary>
@@ -179,11 +179,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
index 4924f5c2037..d8597a9e082 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(string classProperty, int name)
+        public Model200Response(int name, string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -44,28 +44,28 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
             Name = name;
+            Class = _class;
         }
 
-        /// <summary>
-        /// Gets or Sets ClassProperty
-        /// </summary>
-        [JsonPropertyName("class")]
-        public string ClassProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public int Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Class
+        /// </summary>
+        [JsonPropertyName("class")]
+        public string Class { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
             int name = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "class":
-                            classProperty = reader.GetString();
-                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
+                        case "class":
+                            _class = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(classProperty, name);
+            return new Model200Response(name, _class);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
+            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
index 8dd430bc07d..1b73d45c2ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="clientProperty">clientProperty</param>
+        /// <param name="_client">_client</param>
         [JsonConstructor]
-        public ModelClient(string clientProperty)
+        public ModelClient(string _client)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (clientProperty == null)
-                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
+            if (_client == null)
+                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _ClientProperty = clientProperty;
+            _Client = _client;
         }
 
         /// <summary>
-        /// Gets or Sets _ClientProperty
+        /// Gets or Sets _Client
         /// </summary>
         [JsonPropertyName("client")]
-        public string _ClientProperty { get; set; }
+        public string _Client { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
+            sb.Append("  _Client: ").Append(_Client).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string clientProperty = default;
+            string _client = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            clientProperty = reader.GetString();
+                            _client = reader.GetString();
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(clientProperty);
+            return new ModelClient(_client);
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._ClientProperty);
+            writer.WriteString("client", modelClient._Client);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
index c41e6281d6a..d52ec15f9fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
@@ -34,17 +34,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="property">property</param>
         /// <param name="snakeCase">snakeCase</param>
+        /// <param name="property">property</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, string property, int snakeCase, int _123number)
+        public Name(int nameProperty, int snakeCase, string property, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (nameProperty == null)
-                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
+            if (name == null)
+                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -59,8 +59,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            Property = property;
             SnakeCase = snakeCase;
+            Property = property;
             _123Number = _123number;
         }
 
@@ -70,18 +70,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Property
-        /// </summary>
-        [JsonPropertyName("property")]
-        public string Property { get; set; }
-
         /// <summary>
         /// Gets or Sets SnakeCase
         /// </summary>
         [JsonPropertyName("snake_case")]
         public int SnakeCase { get; }
 
+        /// <summary>
+        /// Gets or Sets Property
+        /// </summary>
+        [JsonPropertyName("property")]
+        public string Property { get; set; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -103,8 +103,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -181,8 +181,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            string property = default;
             int snakeCase = default;
+            string property = default;
             int _123number = default;
 
             while (reader.Read())
@@ -203,12 +203,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "property":
-                            property = reader.GetString();
-                            break;
                         case "snake_case":
                             snakeCase = reader.GetInt32();
                             break;
+                        case "property":
+                            property = reader.GetString();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -218,7 +218,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, property, snakeCase, _123number);
+            return new Name(nameProperty, snakeCase, property, _123number);
         }
 
         /// <summary>
@@ -233,8 +233,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteString("property", name.Property);
             writer.WriteNumber("snake_case", name.SnakeCase);
+            writer.WriteString("property", name.Property);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
index e5b8bdba0a9..ef267a31bd5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -33,20 +33,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="booleanProp">booleanProp</param>
+        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
-        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
         /// <param name="objectNullableProp">objectNullableProp</param>
-        /// <param name="stringProp">stringProp</param>
+        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
         [JsonConstructor]
-        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object>? arrayAndItemsNullableProp = default, List<Object>? arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object>? objectAndItemsNullableProp = default, Dictionary<string, Object>? objectNullableProp = default, string? stringProp = default) : base()
+        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string? stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object>? arrayNullableProp = default, List<Object>? arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object>? objectNullableProp = default, Dictionary<string, Object>? objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -60,43 +60,31 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectItemsNullable = objectItemsNullable;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayNullableProp = arrayNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             BooleanProp = booleanProp;
+            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
-            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayItemsNullable = arrayItemsNullable;
             ObjectNullableProp = objectNullableProp;
-            StringProp = stringProp;
+            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ObjectItemsNullable = objectItemsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
-        /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
-        /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object>? ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object>? ArrayNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
         /// Gets or Sets BooleanProp
@@ -104,6 +92,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("boolean_prop")]
         public bool? BooleanProp { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProp
+        /// </summary>
+        [JsonPropertyName("string_prop")]
+        public string? StringProp { get; set; }
+
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
@@ -117,22 +111,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object>? ArrayNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object>? ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object>? ObjectAndItemsNullableProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -141,10 +135,16 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object>? ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string? StringProp { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object>? ObjectAndItemsNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ObjectItemsNullable
+        /// </summary>
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -155,18 +155,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
-            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
             sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
+            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -203,18 +203,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectItemsNullable = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             bool? booleanProp = default;
+            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            int? integerProp = default;
-            decimal? numberProp = default;
-            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayItemsNullable = default;
             Dictionary<string, Object> objectNullableProp = default;
-            string stringProp = default;
+            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            Dictionary<string, Object> objectItemsNullable = default;
 
             while (reader.Read())
             {
@@ -231,43 +231,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
+                        case "string_prop":
+                            stringProp = reader.GetString();
+                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -275,7 +275,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
+            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
         }
 
         /// <summary>
@@ -289,22 +289,6 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            if (nullableClass.BooleanProp != null)
-                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
-            else
-                writer.WriteNull("boolean_prop");
-            writer.WritePropertyName("date_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
-            writer.WritePropertyName("datetime_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
             if (nullableClass.IntegerProp != null)
                 writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
             else
@@ -313,11 +297,27 @@ namespace Org.OpenAPITools.Model
                 writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
             else
                 writer.WriteNull("number_prop");
-            writer.WritePropertyName("object_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            if (nullableClass.BooleanProp != null)
+                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
+            else
+                writer.WriteNull("boolean_prop");
+            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("date_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
+            writer.WritePropertyName("datetime_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
             writer.WritePropertyName("object_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
-            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("object_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index e4ff37c86d2..26bf8a2072c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -33,12 +33,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="bars">bars</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
-        /// <param name="id">id</param>
         /// <param name="uuid">uuid</param>
+        /// <param name="id">id</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="bars">bars</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
+        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,18 +58,24 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Bars = bars;
-            DeprecatedRef = deprecatedRef;
-            Id = id;
             Uuid = uuid;
+            Id = id;
+            DeprecatedRef = deprecatedRef;
+            Bars = bars;
         }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Uuid
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -79,17 +85,11 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -105,10 +105,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Bars: ").Append(Bars).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Bars: ").Append(Bars).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -146,10 +146,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> bars = default;
-            DeprecatedObject deprecatedRef = default;
-            decimal id = default;
             string uuid = default;
+            decimal id = default;
+            DeprecatedObject deprecatedRef = default;
+            List<string> bars = default;
 
             while (reader.Read())
             {
@@ -166,17 +166,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
-                        case "deprecatedRef":
-                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         case "id":
                             id = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetString();
+                        case "deprecatedRef":
+                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                            break;
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -184,7 +184,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
+            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
         }
 
         /// <summary>
@@ -198,12 +198,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("bars");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
             writer.WritePropertyName("deprecatedRef");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WritePropertyName("bars");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
index 672203d0301..c559dca9556 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
-        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
+        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
+        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,17 +54,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
+            MyBoolean = myBoolean;
         }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -77,6 +71,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
+            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myBoolean, myNumber, myString);
+            return new OuterComposite(myNumber, myString, myBoolean);
         }
 
         /// <summary>
@@ -179,9 +179,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
index a5379280cc1..3c792695fed 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
@@ -33,14 +33,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
-        /// <param name="category">category</param>
-        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="status">pet status in the store</param>
+        /// <param name="id">id</param>
+        /// <param name="category">category</param>
         /// <param name="tags">tags</param>
+        /// <param name="status">pet status in the store</param>
         [JsonConstructor]
-        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
+        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -66,12 +66,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Category = category;
-            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Status = status;
+            Id = id;
+            Category = category;
             Tags = tags;
+            Status = status;
         }
 
         /// <summary>
@@ -143,18 +143,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("status")]
         public StatusEnum Status { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Category
-        /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
@@ -167,6 +155,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("photoUrls")]
         public List<string> PhotoUrls { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
+
         /// <summary>
         /// Gets or Sets Tags
         /// </summary>
@@ -187,12 +187,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
             sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -230,12 +230,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Category category = default;
-            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            Pet.StatusEnum status = default;
+            long id = default;
+            Category category = default;
             List<Tag> tags = default;
+            Pet.StatusEnum status = default;
 
             while (reader.Read())
             {
@@ -252,32 +252,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
-                            break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
                         case "photoUrls":
                             photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
-                        case "status":
-                            string statusRawValue = reader.GetString();
-                            status = Pet.StatusEnumFromString(statusRawValue);
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "tags":
                             tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
                             break;
+                        case "status":
+                            string statusRawValue = reader.GetString();
+                            status = Pet.StatusEnumFromString(statusRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(category, id, name, photoUrls, status, tags);
+            return new Pet(name, photoUrls, id, category, tags, status);
         }
 
         /// <summary>
@@ -291,19 +291,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
+            writer.WriteNumber("id", pet.Id);
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
index 9f793b0844b..c614408c264 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
@@ -40,8 +40,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (returnProperty == null)
-                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
+            if (_return == null)
+                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
index cd2254f128b..f1be2a2e9f3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         /// <param name="specialPropertyName">specialPropertyName</param>
+        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         [JsonConstructor]
-        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
+        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -44,28 +44,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelNameProperty == null)
-                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
+            if (specialModelName == null)
+                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialModelNameProperty = specialModelNameProperty;
             SpecialPropertyName = specialPropertyName;
+            SpecialModelNameProperty = specialModelNameProperty;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialModelNameProperty
-        /// </summary>
-        [JsonPropertyName("_special_model.name_")]
-        public string SpecialModelNameProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialPropertyName
         /// </summary>
         [JsonPropertyName("$special[property.name]")]
         public long SpecialPropertyName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialModelNameProperty
+        /// </summary>
+        [JsonPropertyName("_special_model.name_")]
+        public string SpecialModelNameProperty { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string specialModelNameProperty = default;
             long specialPropertyName = default;
+            string specialModelNameProperty = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "_special_model.name_":
-                            specialModelNameProperty = reader.GetString();
-                            break;
                         case "$special[property.name]":
                             specialPropertyName = reader.GetInt64();
                             break;
+                        case "_special_model.name_":
+                            specialModelNameProperty = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
+            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
             writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
+            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
index 1e6f4005eb0..410dadef11a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
@@ -33,20 +33,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="email">email</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="id">id</param>
+        /// <param name="username">username</param>
+        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="email">email</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="username">username</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object? anyTypeProp = default, Object? anyTypePropNullable = default, Object? objectWithNoDeclaredPropsNullable = default)
+        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object? objectWithNoDeclaredPropsNullable = default, Object? anyTypeProp = default, Object? anyTypePropNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -81,37 +81,37 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Email = email;
-            FirstName = firstName;
             Id = id;
+            Username = username;
+            FirstName = firstName;
             LastName = lastName;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            Email = email;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            Username = username;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets FirstName
+        /// Gets or Sets Username
         /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets FirstName
         /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
+        [JsonPropertyName("firstName")]
+        public string FirstName { get; set; }
 
         /// <summary>
         /// Gets or Sets LastName
@@ -120,11 +120,10 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
+        /// Gets or Sets Email
         /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -146,10 +145,18 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// Gets or Sets Username
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
+
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object? ObjectWithNoDeclaredPropsNullable { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -165,13 +172,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object? AnyTypePropNullable { get; set; }
 
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object? ObjectWithNoDeclaredPropsNullable { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -186,18 +186,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -235,18 +235,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string email = default;
-            string firstName = default;
             long id = default;
+            string username = default;
+            string firstName = default;
             string lastName = default;
-            Object objectWithNoDeclaredProps = default;
+            string email = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            string username = default;
+            Object objectWithNoDeclaredProps = default;
+            Object objectWithNoDeclaredPropsNullable = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
-            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -263,20 +263,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "email":
-                            email = reader.GetString();
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "password":
                             password = reader.GetString();
@@ -287,8 +287,11 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "username":
-                            username = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -296,16 +299,13 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
+            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
         }
 
         /// <summary>
@@ -319,22 +319,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("email", user.Email);
-            writer.WriteString("firstName", user.FirstName);
             writer.WriteNumber("id", user.Id);
+            writer.WriteString("username", user.Username);
+            writer.WriteString("firstName", user.FirstName);
             writer.WriteString("lastName", user.LastName);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WriteString("email", user.Email);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WriteString("username", user.Username);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
index 65d841c450c..cf0f5c871be 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
@@ -92,38 +92,31 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
-src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/CookieContainer.cs
-src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
-src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
+src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
+src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
-src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -204,4 +197,3 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
-src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
index f9c1c7f7462..2edcfc0a3d2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
@@ -1 +1,277 @@
-# Created with Openapi Generator
+# Org.OpenAPITools - the C# library for the OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+
+<a name="frameworks-supported"></a>
+## Frameworks supported
+
+<a name="dependencies"></a>
+## Dependencies
+
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
+- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
+- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
+- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
+
+The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package Newtonsoft.Json
+Install-Package JsonSubTypes
+Install-Package System.ComponentModel.Annotations
+Install-Package CompareNETObjects
+```
+<a name="installation"></a>
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] `/bin/sh build.sh`
+- [Windows] `build.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+```
+<a name="packaging"></a>
+## Packaging
+
+A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
+
+This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
+
+```
+nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
+```
+
+Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
+
+<a name="usage"></a>
+## Usage
+
+To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
+```csharp
+Configuration c = new Configuration();
+System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
+webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+c.Proxy = webProxy;
+```
+
+<a name="getting-started"></a>
+## Getting Started
+
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Example
+    {
+        public static void Main()
+        {
+
+            Configuration config = new Configuration();
+            config.BasePath = "http://petstore.swagger.io:80/v2";
+            var apiInstance = new AnotherFakeApi(config);
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test special tags
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (ApiException e)
+            {
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
+                Debug.Print("Status Code: "+ e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+
+        }
+    }
+}
+```
+
+<a name="documentation-for-api-endpoints"></a>
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
+*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
+*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
+*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
+*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
+*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
+*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
+*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
+*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+<a name="documentation-for-models"></a>
+## Documentation for Models
+
+ - [Model.Activity](docs//modelsActivity.md)
+ - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
+ - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
+ - [Model.Animal](docs//modelsAnimal.md)
+ - [Model.ApiResponse](docs//modelsApiResponse.md)
+ - [Model.Apple](docs//modelsApple.md)
+ - [Model.AppleReq](docs//modelsAppleReq.md)
+ - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
+ - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
+ - [Model.ArrayTest](docs//modelsArrayTest.md)
+ - [Model.Banana](docs//modelsBanana.md)
+ - [Model.BananaReq](docs//modelsBananaReq.md)
+ - [Model.BasquePig](docs//modelsBasquePig.md)
+ - [Model.Capitalization](docs//modelsCapitalization.md)
+ - [Model.Cat](docs//modelsCat.md)
+ - [Model.CatAllOf](docs//modelsCatAllOf.md)
+ - [Model.Category](docs//modelsCategory.md)
+ - [Model.ChildCat](docs//modelsChildCat.md)
+ - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
+ - [Model.ClassModel](docs//modelsClassModel.md)
+ - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
+ - [Model.DanishPig](docs//modelsDanishPig.md)
+ - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
+ - [Model.Dog](docs//modelsDog.md)
+ - [Model.DogAllOf](docs//modelsDogAllOf.md)
+ - [Model.Drawing](docs//modelsDrawing.md)
+ - [Model.EnumArrays](docs//modelsEnumArrays.md)
+ - [Model.EnumClass](docs//modelsEnumClass.md)
+ - [Model.EnumTest](docs//modelsEnumTest.md)
+ - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
+ - [Model.File](docs//modelsFile.md)
+ - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
+ - [Model.Foo](docs//modelsFoo.md)
+ - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
+ - [Model.FormatTest](docs//modelsFormatTest.md)
+ - [Model.Fruit](docs//modelsFruit.md)
+ - [Model.FruitReq](docs//modelsFruitReq.md)
+ - [Model.GmFruit](docs//modelsGmFruit.md)
+ - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
+ - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
+ - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
+ - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
+ - [Model.List](docs//modelsList.md)
+ - [Model.Mammal](docs//modelsMammal.md)
+ - [Model.MapTest](docs//modelsMapTest.md)
+ - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model.Model200Response](docs//modelsModel200Response.md)
+ - [Model.ModelClient](docs//modelsModelClient.md)
+ - [Model.Name](docs//modelsName.md)
+ - [Model.NullableClass](docs//modelsNullableClass.md)
+ - [Model.NullableShape](docs//modelsNullableShape.md)
+ - [Model.NumberOnly](docs//modelsNumberOnly.md)
+ - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
+ - [Model.Order](docs//modelsOrder.md)
+ - [Model.OuterComposite](docs//modelsOuterComposite.md)
+ - [Model.OuterEnum](docs//modelsOuterEnum.md)
+ - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
+ - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
+ - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
+ - [Model.ParentPet](docs//modelsParentPet.md)
+ - [Model.Pet](docs//modelsPet.md)
+ - [Model.Pig](docs//modelsPig.md)
+ - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
+ - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
+ - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
+ - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
+ - [Model.Return](docs//modelsReturn.md)
+ - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
+ - [Model.Shape](docs//modelsShape.md)
+ - [Model.ShapeInterface](docs//modelsShapeInterface.md)
+ - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
+ - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
+ - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
+ - [Model.Tag](docs//modelsTag.md)
+ - [Model.Triangle](docs//modelsTriangle.md)
+ - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
+ - [Model.User](docs//modelsUser.md)
+ - [Model.Whale](docs//modelsWhale.md)
+ - [Model.Zebra](docs//modelsZebra.md)
+
+
+<a name="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+<a name="api_key"></a>
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+<a name="api_key_query"></a>
+### api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+<a name="bearer_test"></a>
+### bearer_test
+
+- **Type**: Bearer Authentication
+
+<a name="http_basic_test"></a>
+### http_basic_test
+
+- **Type**: HTTP basic authentication
+
+<a name="http_signature_test"></a>
+### http_signature_test
+
+
+<a name="petstore_auth"></a>
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
index b815f20b5a0..f17e38282a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -652,12 +652,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)
             {
@@ -676,7 +676,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)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, string password = null, string callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 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 _float = 3.4F;  // float? | None (optional) 
+            var _byte = 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 _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime?** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
+| **_byte** | **byte[]** | None |  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **_string** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="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, List<string> enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
             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 enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
-            var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
+            var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
             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 enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
             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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
-| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
+| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
+| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="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)
 
@@ -1053,17 +1053,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)
             {
@@ -1083,7 +1083,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)
 {
@@ -1097,11 +1097,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-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
index da6486e4cdc..8ece47af9ca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="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
 
@@ -689,13 +689,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)
@@ -716,7 +716,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);
@@ -734,8 +734,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
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="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)
 
@@ -784,14 +784,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)
@@ -812,7 +812,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);
@@ -829,8 +829,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-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
index a862c8c112a..fd1c1a7d62b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -646,13 +646,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)
             {
@@ -672,7 +672,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)
 {
@@ -686,8 +686,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-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
index f79869f95a7..1f919450009 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
-**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
index d89ed1a25dc..bc808ceeae3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Message** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**Message** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
index ed572120cd6..32365e6d4d0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
-**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
index 9e225c17232..fde98a967ef 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
+**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**SmallCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
index 6eb0a2e13ea..c2cf3f8e919 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | [default to "default-name"]
+**Id** | **long** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
index a098828a04f..bb35816c914 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
index fcee9662afb..18117e6c938 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
 **NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
+**Shapes** | [**List&lt;Shape&gt;**](Shape.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-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
index 7467f67978c..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 **JustSymbol** | **string** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
index 53bbfe31e77..71602270bab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**EnumStringRequired** | **string** |  | 
+**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**EnumString** | **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
index 78c99facf59..47e50daca3e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringProperty** | [**Foo**](Foo.md) |  | [optional] 
+**String** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
index 4e34a6d18b3..0b92c2fb10a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Binary** | **System.IO.Stream** |  | [optional] 
-**ByteProperty** | **byte[]** |  | 
+**Number** | **decimal** |  | 
+**Byte** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**DateTime** | **DateTime** |  | [optional] 
-**DecimalProperty** | **decimal** |  | [optional] 
-**DoubleProperty** | **double** |  | [optional] 
-**FloatProperty** | **float** |  | [optional] 
+**Password** | **string** |  | 
+**Integer** | **int** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Integer** | **int** |  | [optional] 
-**Number** | **decimal** |  | 
-**Password** | **string** |  | 
+**Float** | **float** |  | [optional] 
+**Double** | **double** |  | [optional] 
+**Decimal** | **decimal** |  | [optional] 
+**String** | **string** |  | [optional] 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**Uuid** | **Guid** |  | [optional] 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
-**StringProperty** | **string** |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
index 5dd27228bb0..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
-**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
+**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 0bac85a8e83..031d2b96065 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
index 93139e1d1aa..8bc8049f46f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
index 51cf0636e72..9e0e83645f3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_ClientProperty** | **string** |  | [optional] 
+**_Client** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
index 11f49b9fd40..2ee782c0c54 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**Property** | **string** |  | [optional] 
 **SnakeCase** | **int** |  | [optional] [readonly] 
+**Property** | **string** |  | [optional] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
index ac86336ea70..d4a19d1856b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
+**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
-**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
+**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
index 9f44c24d19a..b737f7d757a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bars** | **List&lt;string&gt;** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
-**Id** | **decimal** |  | [optional] 
 **Uuid** | **string** |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Bars** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
index 8985c59d094..abf676810fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
+**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
index b13bb576b45..7de10304abf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Status** | **string** | pet status in the store | [optional] 
+**Id** | **long** |  | [optional] 
+**Category** | [**Category**](Category.md) |  | [optional] 
 **Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
index b48f3490005..662fa6f4a38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialModelNameProperty** | **string** |  | [optional] 
 **SpecialPropertyName** | **long** |  | [optional] 
+**SpecialModelNameProperty** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
index 455f031674d..a0f0d223899 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Email** | **string** |  | [optional] 
-**FirstName** | **string** |  | [optional] 
 **Id** | **long** |  | [optional] 
+**Username** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**Email** | **string** |  | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**Username** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 7bca5fd0e17..a166f64a394 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,15 +174,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -214,7 +205,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 0c0b289c532..21230c61955 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -59,7 +59,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool&gt;&gt;</returns>
-        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal&gt;&gt;</returns>
-        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -177,7 +177,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -189,7 +189,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -198,11 +198,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -211,11 +211,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -227,7 +227,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -239,7 +239,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -248,23 +248,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -273,23 +273,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -300,15 +300,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -319,15 +319,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -336,15 +336,15 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -353,15 +353,15 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -373,7 +373,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -385,7 +385,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -398,7 +398,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -411,7 +411,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -427,7 +427,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -657,7 +657,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -707,7 +707,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -932,7 +932,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -982,7 +982,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1315,7 +1315,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1332,7 +1332,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1355,15 +1355,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (fileSchemaTestClass == null)
-                throw new ArgumentNullException(nameof(fileSchemaTestClass));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return fileSchemaTestClass;
         }
 
@@ -1395,7 +1386,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1460,13 +1451,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1478,16 +1469,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1501,33 +1492,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
+        protected virtual (string, User) OnTestBodyWithQueryParams(string query, User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (query == null)
-                throw new ArgumentNullException(nameof(query));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, query);
+            return (query, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, string query, User user)
         {
         }
 
@@ -1537,9 +1516,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string query, User user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1548,19 +1527,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(user, query);
-                user = validatedParameters.Item1;
-                query = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(query, user);
+                query = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1607,7 +1586,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, user, query);
+                            AfterTestBodyWithQueryParams(apiResponse, query, user);
                         }
 
                         return apiResponse;
@@ -1616,7 +1595,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
                 throw;
             }
         }
@@ -1628,7 +1607,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1645,7 +1624,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -1668,15 +1647,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -1708,7 +1678,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1782,25 +1752,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1812,28 +1782,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1847,63 +1817,45 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream, float?, int?, int?, long?, string, string, string, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual (decimal, double, string, byte[], int?, int?, long?, float?, string, System.IO.Stream, DateTime?, string, string, DateTime?) OnTestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (_byte == null)
-                throw new ArgumentNullException(nameof(_byte));
-
-            if (number == null)
-                throw new ArgumentNullException(nameof(number));
-
-            if (_double == null)
-                throw new ArgumentNullException(nameof(_double));
-
-            if (patternWithoutDelimiter == null)
-                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
         }
 
@@ -1913,21 +1865,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1936,40 +1888,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
-                _byte = validatedParameters.Item1;
-                number = validatedParameters.Item2;
-                _double = validatedParameters.Item3;
-                patternWithoutDelimiter = validatedParameters.Item4;
-                date = validatedParameters.Item5;
-                binary = validatedParameters.Item6;
-                _float = validatedParameters.Item7;
-                integer = validatedParameters.Item8;
-                int32 = validatedParameters.Item9;
-                int64 = validatedParameters.Item10;
-                _string = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                number = validatedParameters.Item1;
+                _double = validatedParameters.Item2;
+                patternWithoutDelimiter = validatedParameters.Item3;
+                _byte = validatedParameters.Item4;
+                integer = validatedParameters.Item5;
+                int32 = validatedParameters.Item6;
+                int64 = validatedParameters.Item7;
+                _float = validatedParameters.Item8;
+                _string = validatedParameters.Item9;
+                binary = validatedParameters.Item10;
+                date = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -1989,10 +1941,6 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
-                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
-
-
-
                     formParams.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -2003,14 +1951,9 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
+                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer)));
@@ -2021,9 +1964,18 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64)));
 
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
+
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(_string)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
+
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
+
                     if (password != null)
                         formParams.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password)));
 
@@ -2069,7 +2021,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2081,7 +2033,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                 throw;
             }
         }
@@ -2092,17 +2044,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2116,20 +2068,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2145,16 +2097,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>, List<string>, double?, int?, List<string>, string, string, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual (List<string>, List<string>, int?, double?, string, string, List<string>, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -2163,13 +2115,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
         }
 
@@ -2181,13 +2133,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2198,28 +2150,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryDouble = validatedParameters.Item3;
-                enumQueryInteger = validatedParameters.Item4;
-                enumFormStringArray = validatedParameters.Item5;
-                enumHeaderString = validatedParameters.Item6;
-                enumQueryString = validatedParameters.Item7;
+                enumQueryInteger = validatedParameters.Item3;
+                enumQueryDouble = validatedParameters.Item4;
+                enumHeaderString = validatedParameters.Item5;
+                enumQueryString = validatedParameters.Item6;
+                enumFormStringArray = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2233,12 +2185,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString());
 
-                    if (enumQueryDouble != null)
-                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
-
                     if (enumQueryInteger != null)
                         parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
 
+                    if (enumQueryDouble != null)
+                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString());
 
@@ -2290,7 +2242,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                         }
 
                         return apiResponse;
@@ -2299,7 +2251,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 throw;
             }
         }
@@ -2308,17 +2260,17 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2330,20 +2282,20 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2357,44 +2309,29 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <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>
         /// <returns></returns>
-        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual (int, bool, long, int?, bool?, long?) OnTestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredBooleanGroup == null)
-                throw new ArgumentNullException(nameof(requiredBooleanGroup));
-
-            if (requiredStringGroup == null)
-                throw new ArgumentNullException(nameof(requiredStringGroup));
-
-            if (requiredInt64Group == null)
-                throw new ArgumentNullException(nameof(requiredInt64Group));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></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>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
         }
 
@@ -2404,13 +2341,13 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2419,26 +2356,26 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
-                requiredBooleanGroup = validatedParameters.Item1;
-                requiredStringGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                requiredStringGroup = validatedParameters.Item1;
+                requiredBooleanGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                booleanGroup = validatedParameters.Item4;
-                stringGroup = validatedParameters.Item5;
+                stringGroup = validatedParameters.Item4;
+                booleanGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2493,7 +2430,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2505,7 +2442,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 throw;
             }
         }
@@ -2517,7 +2454,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2534,7 +2471,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2557,15 +2494,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requestBody == null)
-                throw new ArgumentNullException(nameof(requestBody));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return requestBody;
         }
 
@@ -2597,7 +2525,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2666,7 +2594,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2684,7 +2612,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2708,18 +2636,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnTestJsonFormData(string param, string param2)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (param == null)
-                throw new ArgumentNullException(nameof(param));
-
-            if (param2 == null)
-                throw new ArgumentNullException(nameof(param2));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (param, param2);
         }
 
@@ -2754,7 +2670,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2838,7 +2754,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -2859,7 +2775,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2886,27 +2802,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pipe == null)
-                throw new ArgumentNullException(nameof(pipe));
-
-            if (ioutil == null)
-                throw new ArgumentNullException(nameof(ioutil));
-
-            if (http == null)
-                throw new ArgumentNullException(nameof(http));
-
-            if (url == null)
-                throw new ArgumentNullException(nameof(url));
-
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (pipe, ioutil, http, url, context);
         }
 
@@ -2950,7 +2845,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 07d8973b740..7a54b0384f5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,15 +174,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClassname(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -214,7 +205,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
index 33b932d41a8..2eb7ffbf0fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -87,7 +87,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -99,7 +99,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -111,7 +111,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet&gt;&gt;</returns>
-        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -185,7 +185,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -209,11 +209,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -250,12 +250,12 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -340,7 +340,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -357,7 +357,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -380,15 +380,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnAddPet(Pet pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -420,7 +411,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -512,7 +503,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -530,7 +521,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -554,15 +545,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string) OnDeletePet(long petId, string apiKey)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, apiKey);
         }
 
@@ -597,7 +579,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -668,7 +650,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -685,7 +667,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -708,15 +690,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByStatus(List<string> status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (status == null)
-                throw new ArgumentNullException(nameof(status));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return status;
         }
 
@@ -748,7 +721,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -841,7 +814,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -858,7 +831,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -881,15 +854,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByTags(List<string> tags)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (tags == null)
-                throw new ArgumentNullException(nameof(tags));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return tags;
         }
 
@@ -921,7 +885,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1014,7 +978,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -1031,7 +995,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = null;
             try 
@@ -1054,15 +1018,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetPetById(long petId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return petId;
         }
 
@@ -1094,7 +1049,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1168,7 +1123,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1185,7 +1140,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1208,15 +1163,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnUpdatePet(Pet pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -1248,7 +1194,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1341,7 +1287,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1360,7 +1306,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1385,15 +1331,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string, string) OnUpdatePetWithForm(long petId, string name, string status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, name, status);
         }
 
@@ -1431,7 +1368,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1519,13 +1456,13 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1538,16 +1475,16 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1562,21 +1499,12 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        protected virtual (long, System.IO.Stream, string) OnUploadFile(long petId, System.IO.Stream file, string additionalMetadata)
+        protected virtual (long, string, System.IO.Stream) OnUploadFile(long petId, string additionalMetadata, System.IO.Stream file)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (petId, file, additionalMetadata);
+            return (petId, additionalMetadata, file);
         }
 
         /// <summary>
@@ -1584,9 +1512,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream file, string additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, string additionalMetadata, System.IO.Stream file)
         {
         }
 
@@ -1597,9 +1525,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream file, string additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, string additionalMetadata, System.IO.Stream file)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1609,20 +1537,20 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
+                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
                 petId = validatedParameters.Item1;
-                file = validatedParameters.Item2;
-                additionalMetadata = validatedParameters.Item3;
+                additionalMetadata = validatedParameters.Item2;
+                file = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1637,12 +1565,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string, string>> formParams = new List<KeyValuePair<string, string>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
-                        multipartContent.Add(new StreamContent(file));
-
-                    if (additionalMetadata != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
                         formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
 
+                    if (file != null)
+                        multipartContent.Add(new StreamContent(file));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1688,7 +1616,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
+                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1700,7 +1628,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
                 throw;
             }
         }
@@ -1709,14 +1637,14 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1728,17 +1656,17 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1752,35 +1680,23 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (System.IO.Stream, long, string) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual (long, System.IO.Stream, string) OnUploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredFile == null)
-                throw new ArgumentNullException(nameof(requiredFile));
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredFile, petId, additionalMetadata);
+            return (petId, requiredFile, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
         }
 
@@ -1790,10 +1706,10 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1802,20 +1718,20 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
-                requiredFile = validatedParameters.Item1;
-                petId = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                petId = validatedParameters.Item1;
+                requiredFile = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1882,7 +1798,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1894,7 +1810,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
index 168268cb800..3ed6709ec52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -95,7 +95,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -204,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -221,7 +221,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -244,15 +244,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteOrder(string orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -284,7 +275,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -457,7 +448,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -474,7 +465,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -497,15 +488,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetOrderById(long orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -537,7 +519,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -602,7 +584,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -619,7 +601,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -642,15 +624,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Order OnPlaceOrder(Order order)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (order == null)
-                throw new ArgumentNullException(nameof(order));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return order;
         }
 
@@ -682,7 +655,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
index 541b8c83155..fcb08604e0f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -73,7 +73,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -85,7 +85,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User&gt;&gt;</returns>
-        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -158,7 +158,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string&gt;&gt;</returns>
-        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -202,11 +202,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -215,11 +215,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -304,7 +304,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -321,7 +321,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -344,15 +344,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual User OnCreateUser(User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -384,7 +375,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -452,7 +443,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -469,7 +460,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -492,15 +483,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -532,7 +514,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -600,7 +582,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -617,7 +599,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -640,15 +622,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -680,7 +653,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -748,7 +721,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -765,7 +738,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -788,15 +761,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteUser(string username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -828,7 +792,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -883,7 +847,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -900,7 +864,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = null;
             try 
@@ -923,15 +887,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnGetUserByName(string username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -963,7 +918,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1029,7 +984,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1049,18 +1004,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnLoginUser(string username, string password)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            if (password == null)
-                throw new ArgumentNullException(nameof(password));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (username, password);
         }
 
@@ -1095,7 +1038,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1286,13 +1229,13 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1304,16 +1247,16 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1327,33 +1270,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnUpdateUser(User user, string username)
+        protected virtual (string, User) OnUpdateUser(string username, User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, username);
+            return (username, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, string username, User user)
         {
         }
 
@@ -1363,9 +1294,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string username, User user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1374,19 +1305,19 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(user, username);
-                user = validatedParameters.Item1;
-                username = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(username, user);
+                username = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1427,7 +1358,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, user, username);
+                            AfterUpdateUser(apiResponse, username, user);
                         }
 
                         return apiResponse;
@@ -1436,7 +1367,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/IApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/IApi.cs
new file mode 100644
index 00000000000..038f19bcfa1
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/IApi.cs
@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+namespace Org.OpenAPITools.IApi
+{
+    /// <summary>
+    /// Any Api client
+    /// </summary>
+    public interface IApi
+    {
+        /// <summary>
+        /// The HttpClient
+        /// </summary>
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
new file mode 100644
index 00000000000..a5253e58201
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
@@ -0,0 +1,29 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using Newtonsoft.Json.Converters;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class OpenAPIDateConverter : IsoDateTimeConverter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenAPIDateConverter" /> class.
+        /// </summary>
+        public OpenAPIDateConverter()
+        {
+            // full-date   = date-fullyear "-" date-month "-" date-mday
+            DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 5682c09e840..267679a9928 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -31,16 +31,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
         /// <param name="mapProperty">mapProperty</param>
+        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
+        /// <param name="anytype1">anytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
-        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object anytype1 = default)
+        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -69,22 +69,21 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EmptyMap = emptyMap;
-            MapOfMapProperty = mapOfMapProperty;
             MapProperty = mapProperty;
+            MapOfMapProperty = mapOfMapProperty;
+            Anytype1 = anytype1;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
+            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
-            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
+        /// Gets or Sets MapProperty
         /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -93,10 +92,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets Anytype1
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        [JsonPropertyName("anytype_1")]
+        public Object Anytype1 { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -117,16 +116,17 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapWithUndeclaredPropertiesString
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_with_undeclared_properties_string")]
-        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object Anytype1 { get; set; }
+        [JsonPropertyName("map_with_undeclared_properties_string")]
+        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -142,14 +142,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
             sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -187,14 +187,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Object emptyMap = default;
-            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
             Dictionary<string, string> mapProperty = default;
+            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
+            Object anytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
+            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
-            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -211,14 +211,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -229,19 +229,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
+            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
         }
 
         /// <summary>
@@ -255,22 +255,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
-            writer.WritePropertyName("map_of_map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
             writer.WritePropertyName("map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("map_of_map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
index 3610a2a0bec..73eee830ea0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -32,10 +32,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="message">message</param>
         /// <param name="type">type</param>
+        /// <param name="message">message</param>
         [JsonConstructor]
-        public ApiResponse(int code, string message, string type)
+        public ApiResponse(int code, string type, string message)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -53,8 +53,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Message = message;
             Type = type;
+            Message = message;
         }
 
         /// <summary>
@@ -63,18 +63,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Message
-        /// </summary>
-        [JsonPropertyName("message")]
-        public string Message { get; set; }
-
         /// <summary>
         /// Gets or Sets Type
         /// </summary>
         [JsonPropertyName("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Message
+        /// </summary>
+        [JsonPropertyName("message")]
+        public string Message { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -90,8 +90,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -130,8 +130,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string message = default;
             string type = default;
+            string message = default;
 
             while (reader.Read())
             {
@@ -151,19 +151,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "message":
-                            message = reader.GetString();
-                            break;
                         case "type":
                             type = reader.GetString();
                             break;
+                        case "message":
+                            message = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, message, type);
+            return new ApiResponse(code, type, message);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("message", apiResponse.Message);
             writer.WriteString("type", apiResponse.Type);
+            writer.WriteString("message", apiResponse.Message);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
index ef26590ab3c..d628f7aac0b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
+        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
-        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
+        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
-            ArrayOfString = arrayOfString;
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
-            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
+            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
         }
 
         /// <summary>
@@ -177,12 +177,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
index 0d25bc70612..8cb011aa50c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
         /// <param name="capitalCamel">capitalCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="smallCamel">smallCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         [JsonConstructor]
-        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
+        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,20 +64,19 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
             CapitalCamel = capitalCamel;
+            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            SmallCamel = smallCamel;
-            SmallSnake = smallSnake;
+            ATT_NAME = aTTNAME;
         }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -85,6 +84,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
+
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -98,16 +103,11 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
-        /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
-
-        /// <summary>
-        /// Gets or Sets SmallSnake
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -123,12 +123,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -166,12 +166,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string aTTNAME = default;
+            string smallCamel = default;
             string capitalCamel = default;
+            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string smallCamel = default;
-            string smallSnake = default;
+            string aTTNAME = default;
 
             while (reader.Read())
             {
@@ -188,23 +188,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
+                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
-                            break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         default:
                             break;
@@ -212,7 +212,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
+            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
         }
 
         /// <summary>
@@ -226,12 +226,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
index 113fd3d276d..444fbaaccdb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="id">id</param>
         /// <param name="name">name (default to &quot;default-name&quot;)</param>
+        /// <param name="id">id</param>
         [JsonConstructor]
-        public Category(long id, string name = "default-name")
+        public Category(string name = "default-name", long id)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,22 +48,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
             Name = name;
+            Id = id;
         }
 
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
             string name = default;
+            long id = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(id, name);
+            return new Category(name, id);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", category.Id);
             writer.WriteString("name", category.Name);
+            writer.WriteNumber("id", category.Id);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
index be70d0da28b..81fd55bd903 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public ClassModel(string classProperty)
+        public ClassModel(string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
+            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets ClassProperty
+        /// Gets or Sets Class
         /// </summary>
         [JsonPropertyName("_class")]
-        public string ClassProperty { get; set; }
+        public string Class { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            classProperty = reader.GetString();
+                            _class = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(classProperty);
+            return new ClassModel(_class);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.ClassProperty);
+            writer.WriteString("_class", classModel.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
index 6de00f19504..4d107d8d323 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="shapes">shapes</param>
         /// <param name="nullableShape">nullableShape</param>
+        /// <param name="shapes">shapes</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape nullableShape = default) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape nullableShape = default, List<Shape> shapes) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            Shapes = shapes;
             NullableShape = nullableShape;
+            Shapes = shapes;
         }
 
         /// <summary>
@@ -71,18 +71,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Shapes
-        /// </summary>
-        [JsonPropertyName("shapes")]
-        public List<Shape> Shapes { get; set; }
-
         /// <summary>
         /// Gets or Sets NullableShape
         /// </summary>
         [JsonPropertyName("nullableShape")]
         public NullableShape NullableShape { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Shapes
+        /// </summary>
+        [JsonPropertyName("shapes")]
+        public List<Shape> Shapes { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -94,8 +94,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
+            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -134,8 +134,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            List<Shape> shapes = default;
             NullableShape nullableShape = default;
+            List<Shape> shapes = default;
 
             while (reader.Read())
             {
@@ -158,19 +158,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "shapes":
-                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
-                            break;
                         case "nullableShape":
                             nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
                             break;
+                        case "shapes":
+                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
+            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
         }
 
         /// <summary>
@@ -188,10 +188,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("shapes");
-            JsonSerializer.Serialize(writer, drawing.Shapes, options);
             writer.WritePropertyName("nullableShape");
             JsonSerializer.Serialize(writer, drawing.NullableShape, options);
+            writer.WritePropertyName("shapes");
+            JsonSerializer.Serialize(writer, drawing.Shapes, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index c6dcd8b5b24..724ee8139bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="arrayEnum">arrayEnum</param>
         /// <param name="justSymbol">justSymbol</param>
+        /// <param name="arrayEnum">arrayEnum</param>
         [JsonConstructor]
-        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
+        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,41 +48,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayEnum = arrayEnum;
             JustSymbol = justSymbol;
+            ArrayEnum = arrayEnum;
         }
 
         /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -91,48 +91,54 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Gets or Sets JustSymbol
         /// </summary>
-        public enum JustSymbolEnum
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
+        /// <summary>
+        /// Defines ArrayEnum
+        /// </summary>
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -141,23 +147,17 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
+            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -217,8 +217,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
             EnumArrays.JustSymbolEnum justSymbol = default;
+            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
 
             while (reader.Read())
             {
@@ -235,20 +235,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(arrayEnum, justSymbol);
+            return new EnumArrays(justSymbol, arrayEnum);
         }
 
         /// <summary>
@@ -262,13 +262,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 9c13e1739d1..530cc907a07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -31,17 +31,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
+        /// <param name="enumStringRequired">enumStringRequired</param>
+        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="enumString">enumString</param>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
-        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
+        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -73,48 +73,56 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            EnumStringRequired = enumStringRequired;
+            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            EnumString = enumString;
-            EnumStringRequired = enumStringRequired;
-            OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnum = outerEnum;
             OuterEnumInteger = outerEnumInteger;
+            OuterEnumDefaultValue = outerEnumDefaultValue;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
-            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -123,48 +131,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            return (int) value;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -173,48 +198,57 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -223,62 +257,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
-
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -287,65 +307,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            Lower = 2,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -354,31 +357,28 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
 
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
+        /// Gets or Sets OuterEnum
         /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -387,16 +387,16 @@ namespace Org.OpenAPITools.Model
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumIntegerDefaultValue
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnumIntegerDefaultValue")]
-        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumIntegerDefaultValue")]
+        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -412,15 +412,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -458,15 +458,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
+            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            EnumTest.EnumStringEnum enumString = default;
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnum? outerEnum = default;
             OuterEnumInteger outerEnumInteger = default;
+            OuterEnumDefaultValue outerEnumDefaultValue = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
-            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -483,6 +483,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                            break;
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -492,37 +500,29 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
-                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
+            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
         }
 
         /// <summary>
@@ -536,41 +536,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
-            if (enumStringRawValue != null)
-                writer.WriteString("enum_string", enumStringRawValue);
-            else
-                writer.WriteNull("enum_string");
             var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
             if (enumStringRequiredRawValue != null)
                 writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
                 writer.WriteNull("enum_string_required");
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
-            if (outerEnumDefaultValueRawValue != null)
-                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
+            if (enumStringRawValue != null)
+                writer.WriteString("enum_string", enumStringRawValue);
             else
-                writer.WriteNull("outerEnumDefaultValue");
+                writer.WriteNull("enum_string");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
             var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
             if (outerEnumIntegerRawValue != null)
                 writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
             else
                 writer.WriteNull("outerEnumInteger");
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            if (outerEnumDefaultValueRawValue != null)
+                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            else
+                writer.WriteNull("outerEnumDefaultValue");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index a17a59ac541..bf0b8bec3f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="_string">_string</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo stringProperty)
+        public FooGetDefaultResponse(Foo _string)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            StringProperty = stringProperty;
+            String = _string;
         }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets String
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo StringProperty { get; set; }
+        public Foo String { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo stringProperty = default;
+            Foo _string = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(stringProperty);
+            return new FooGetDefaultResponse(_string);
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
index 3b28c9e5a5c..d0dd73bfe2e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -31,24 +31,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="binary">binary</param>
-        /// <param name="byteProperty">byteProperty</param>
+        /// <param name="number">number</param>
+        /// <param name="_byte">_byte</param>
         /// <param name="date">date</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="decimalProperty">decimalProperty</param>
-        /// <param name="doubleProperty">doubleProperty</param>
-        /// <param name="floatProperty">floatProperty</param>
+        /// <param name="password">password</param>
+        /// <param name="integer">integer</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="integer">integer</param>
-        /// <param name="number">number</param>
-        /// <param name="password">password</param>
+        /// <param name="_float">_float</param>
+        /// <param name="_double">_double</param>
+        /// <param name="_decimal">_decimal</param>
+        /// <param name="_string">_string</param>
+        /// <param name="binary">binary</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="uuid">uuid</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
-        /// <param name="stringProperty">stringProperty</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
+        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -65,20 +65,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (floatProperty == null)
-                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
+            if (_float == null)
+                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
 
-            if (doubleProperty == null)
-                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
+            if (_double == null)
+                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
 
-            if (decimalProperty == null)
-                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
+            if (_decimal == null)
+                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
 
-            if (byteProperty == null)
-                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
+            if (_byte == null)
+                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -104,35 +104,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Binary = binary;
-            ByteProperty = byteProperty;
+            Number = number;
+            Byte = _byte;
             Date = date;
-            DateTime = dateTime;
-            DecimalProperty = decimalProperty;
-            DoubleProperty = doubleProperty;
-            FloatProperty = floatProperty;
+            Password = password;
+            Integer = integer;
             Int32 = int32;
             Int64 = int64;
-            Integer = integer;
-            Number = number;
-            Password = password;
+            Float = _float;
+            Double = _double;
+            Decimal = _decimal;
+            String = _string;
+            Binary = binary;
+            DateTime = dateTime;
+            Uuid = uuid;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
-            StringProperty = stringProperty;
-            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets ByteProperty
+        /// Gets or Sets Byte
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] ByteProperty { get; set; }
+        public byte[] Byte { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -141,28 +141,16 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
-        /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DecimalProperty
-        /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal DecimalProperty { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DoubleProperty
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("double")]
-        public double DoubleProperty { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
-        /// Gets or Sets FloatProperty
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("float")]
-        public float FloatProperty { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
         /// Gets or Sets Int32
@@ -177,42 +165,40 @@ namespace Org.OpenAPITools.Model
         public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets Float
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
+        [JsonPropertyName("float")]
+        public float Float { get; set; }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Double
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("double")]
+        public double Double { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets Decimal
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal Decimal { get; set; }
 
         /// <summary>
-        /// A string that is a 10 digit number. Can have leading zeros.
+        /// Gets or Sets String
         /// </summary>
-        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
-        [JsonPropertyName("pattern_with_digits")]
-        public string PatternWithDigits { get; set; }
+        [JsonPropertyName("string")]
+        public string String { get; set; }
 
         /// <summary>
-        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// Gets or Sets Binary
         /// </summary>
-        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
-        [JsonPropertyName("pattern_with_digits_and_delimiter")]
-        public string PatternWithDigitsAndDelimiter { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("string")]
-        public string StringProperty { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
         /// Gets or Sets Uuid
@@ -220,6 +206,20 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("uuid")]
         public Guid Uuid { get; set; }
 
+        /// <summary>
+        /// A string that is a 10 digit number. Can have leading zeros.
+        /// </summary>
+        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
+        [JsonPropertyName("pattern_with_digits")]
+        public string PatternWithDigits { get; set; }
+
+        /// <summary>
+        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// </summary>
+        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
+        [JsonPropertyName("pattern_with_digits_and_delimiter")]
+        public string PatternWithDigitsAndDelimiter { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -234,22 +234,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Byte: ").Append(Byte).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
-            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
-            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Float: ").Append(Float).Append("\n");
+            sb.Append("  Double: ").Append(Double).Append("\n");
+            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -261,28 +261,40 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // DoubleProperty (double) maximum
-            if (this.DoubleProperty > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+            }
+
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+            }
+
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
             }
 
-            // DoubleProperty (double) minimum
-            if (this.DoubleProperty < (double)67.8)
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
-            // FloatProperty (float) maximum
-            if (this.FloatProperty > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // FloatProperty (float) minimum
-            if (this.FloatProperty < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
             // Int32 (int) maximum
@@ -297,40 +309,35 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // Float (float) maximum
+            if (this.Float > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // Float (float) minimum
+            if (this.Float < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
             }
 
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
+            // Double (double) maximum
+            if (this.Double > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
             }
 
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // Double (double) minimum
+            if (this.Double < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
             }
 
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
-            }
-
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // String (string) pattern
+            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexString.Match(this.String).Success)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
             }
 
             // PatternWithDigits (string) pattern
@@ -347,13 +354,6 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
-            // StringProperty (string) pattern
-            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexStringProperty.Match(this.StringProperty).Success)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
-            }
-
             yield break;
         }
     }
@@ -380,22 +380,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            System.IO.Stream binary = default;
-            byte[] byteProperty = default;
+            decimal number = default;
+            byte[] _byte = default;
             DateTime date = default;
-            DateTime dateTime = default;
-            decimal decimalProperty = default;
-            double doubleProperty = default;
-            float floatProperty = default;
+            string password = default;
+            int integer = default;
             int int32 = default;
             long int64 = default;
-            int integer = default;
-            decimal number = default;
-            string password = default;
+            float _float = default;
+            double _double = default;
+            decimal _decimal = default;
+            string _string = default;
+            System.IO.Stream binary = default;
+            DateTime dateTime = default;
+            Guid uuid = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
-            string stringProperty = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -412,26 +412,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
                         case "byte":
-                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
-                            break;
-                        case "decimal":
-                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "double":
-                            doubleProperty = reader.GetDouble();
+                        case "password":
+                            password = reader.GetString();
                             break;
-                        case "float":
-                            floatProperty = (float)reader.GetDouble();
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -439,34 +433,40 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "float":
+                            _float = (float)reader.GetDouble();
                             break;
-                        case "number":
-                            number = reader.GetInt32();
+                        case "double":
+                            _double = reader.GetDouble();
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "decimal":
+                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
                             break;
-                        case "pattern_with_digits":
-                            patternWithDigits = reader.GetString();
+                        case "string":
+                            _string = reader.GetString();
                             break;
-                        case "pattern_with_digits_and_delimiter":
-                            patternWithDigitsAndDelimiter = reader.GetString();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
-                        case "string":
-                            stringProperty = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "uuid":
                             uuid = reader.GetGuid();
                             break;
+                        case "pattern_with_digits":
+                            patternWithDigits = reader.GetString();
+                            break;
+                        case "pattern_with_digits_and_delimiter":
+                            patternWithDigitsAndDelimiter = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
+            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
         }
 
         /// <summary>
@@ -480,27 +480,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WriteNumber("number", formatTest.Number);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
+            JsonSerializer.Serialize(writer, formatTest.Byte, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WritePropertyName("dateTime");
-            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
-            writer.WriteNumber("double", formatTest.DoubleProperty);
-            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("integer", formatTest.Integer);
             writer.WriteNumber("int32", formatTest.Int32);
             writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("number", formatTest.Number);
-            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("float", formatTest.Float);
+            writer.WriteNumber("double", formatTest.Double);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
+            writer.WriteString("string", formatTest.String);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WritePropertyName("dateTime");
+            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
+            writer.WriteString("uuid", formatTest.Uuid);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
-            writer.WriteString("string", formatTest.StringProperty);
-            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
index 777120531d2..413f56633ab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="directMap">directMap</param>
-        /// <param name="indirectMap">indirectMap</param>
         /// <param name="mapMapOfString">mapMapOfString</param>
         /// <param name="mapOfEnumString">mapOfEnumString</param>
+        /// <param name="directMap">directMap</param>
+        /// <param name="indirectMap">indirectMap</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
+        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,10 +56,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            DirectMap = directMap;
-            IndirectMap = indirectMap;
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
+            DirectMap = directMap;
+            IndirectMap = indirectMap;
         }
 
         /// <summary>
@@ -112,18 +112,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets DirectMap
-        /// </summary>
-        [JsonPropertyName("direct_map")]
-        public Dictionary<string, bool> DirectMap { get; set; }
-
-        /// <summary>
-        /// Gets or Sets IndirectMap
-        /// </summary>
-        [JsonPropertyName("indirect_map")]
-        public Dictionary<string, bool> IndirectMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
@@ -136,6 +124,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_of_enum_string")]
         public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets DirectMap
+        /// </summary>
+        [JsonPropertyName("direct_map")]
+        public Dictionary<string, bool> DirectMap { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IndirectMap
+        /// </summary>
+        [JsonPropertyName("indirect_map")]
+        public Dictionary<string, bool> IndirectMap { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -150,10 +150,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
-            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
             sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
+            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
+            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -191,10 +191,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, bool> directMap = default;
-            Dictionary<string, bool> indirectMap = default;
             Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
             Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
+            Dictionary<string, bool> directMap = default;
+            Dictionary<string, bool> indirectMap = default;
 
             while (reader.Read())
             {
@@ -211,25 +211,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "direct_map":
-                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
-                        case "indirect_map":
-                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
                         case "map_map_of_string":
                             mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
                         case "map_of_enum_string":
                             mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
                             break;
+                        case "direct_map":
+                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
+                        case "indirect_map":
+                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
+            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
         }
 
         /// <summary>
@@ -243,14 +243,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("direct_map");
-            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
-            writer.WritePropertyName("indirect_map");
-            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
             writer.WritePropertyName("map_map_of_string");
             JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
             writer.WritePropertyName("map_of_enum_string");
             JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
+            writer.WritePropertyName("direct_map");
+            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
+            writer.WritePropertyName("indirect_map");
+            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 4806980e331..520c4896c8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
+        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
+        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
-            Uuid = uuid;
         }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
+            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
         }
 
         /// <summary>
@@ -177,11 +177,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
index e4e9a8611ab..e805657a406 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(string classProperty, int name)
+        public Model200Response(int name, string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
             Name = name;
+            Class = _class;
         }
 
-        /// <summary>
-        /// Gets or Sets ClassProperty
-        /// </summary>
-        [JsonPropertyName("class")]
-        public string ClassProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public int Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Class
+        /// </summary>
+        [JsonPropertyName("class")]
+        public string Class { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
             int name = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "class":
-                            classProperty = reader.GetString();
-                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
+                        case "class":
+                            _class = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(classProperty, name);
+            return new Model200Response(name, _class);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
+            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
index dc243ef72f6..bb6857ac351 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="clientProperty">clientProperty</param>
+        /// <param name="_client">_client</param>
         [JsonConstructor]
-        public ModelClient(string clientProperty)
+        public ModelClient(string _client)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (clientProperty == null)
-                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
+            if (_client == null)
+                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _ClientProperty = clientProperty;
+            _Client = _client;
         }
 
         /// <summary>
-        /// Gets or Sets _ClientProperty
+        /// Gets or Sets _Client
         /// </summary>
         [JsonPropertyName("client")]
-        public string _ClientProperty { get; set; }
+        public string _Client { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
+            sb.Append("  _Client: ").Append(_Client).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string clientProperty = default;
+            string _client = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            clientProperty = reader.GetString();
+                            _client = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(clientProperty);
+            return new ModelClient(_client);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._ClientProperty);
+            writer.WriteString("client", modelClient._Client);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
index 9b07795a3e5..f22e38dfc5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
@@ -32,17 +32,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="property">property</param>
         /// <param name="snakeCase">snakeCase</param>
+        /// <param name="property">property</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, string property, int snakeCase, int _123number)
+        public Name(int nameProperty, int snakeCase, string property, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (nameProperty == null)
-                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
+            if (name == null)
+                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            Property = property;
             SnakeCase = snakeCase;
+            Property = property;
             _123Number = _123number;
         }
 
@@ -68,18 +68,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Property
-        /// </summary>
-        [JsonPropertyName("property")]
-        public string Property { get; set; }
-
         /// <summary>
         /// Gets or Sets SnakeCase
         /// </summary>
         [JsonPropertyName("snake_case")]
         public int SnakeCase { get; }
 
+        /// <summary>
+        /// Gets or Sets Property
+        /// </summary>
+        [JsonPropertyName("property")]
+        public string Property { get; set; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -101,8 +101,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -179,8 +179,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            string property = default;
             int snakeCase = default;
+            string property = default;
             int _123number = default;
 
             while (reader.Read())
@@ -201,12 +201,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "property":
-                            property = reader.GetString();
-                            break;
                         case "snake_case":
                             snakeCase = reader.GetInt32();
                             break;
+                        case "property":
+                            property = reader.GetString();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -216,7 +216,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, property, snakeCase, _123number);
+            return new Name(nameProperty, snakeCase, property, _123number);
         }
 
         /// <summary>
@@ -231,8 +231,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteString("property", name.Property);
             writer.WriteNumber("snake_case", name.SnakeCase);
+            writer.WriteString("property", name.Property);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
index 5267e11d8b1..2ad9b9f2522 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="booleanProp">booleanProp</param>
+        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
-        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
         /// <param name="objectNullableProp">objectNullableProp</param>
-        /// <param name="stringProp">stringProp</param>
+        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
         [JsonConstructor]
-        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectNullableProp = default, string stringProp = default) : base()
+        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object> arrayNullableProp = default, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object> objectNullableProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,43 +58,31 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectItemsNullable = objectItemsNullable;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayNullableProp = arrayNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             BooleanProp = booleanProp;
+            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
-            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayItemsNullable = arrayItemsNullable;
             ObjectNullableProp = objectNullableProp;
-            StringProp = stringProp;
+            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ObjectItemsNullable = objectItemsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
-        /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
-        /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object> ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object> ArrayNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
         /// Gets or Sets BooleanProp
@@ -102,6 +90,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("boolean_prop")]
         public bool? BooleanProp { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProp
+        /// </summary>
+        [JsonPropertyName("string_prop")]
+        public string StringProp { get; set; }
+
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
@@ -115,22 +109,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object> ArrayNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object> ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -139,10 +133,16 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string StringProp { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ObjectItemsNullable
+        /// </summary>
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -153,18 +153,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
-            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
             sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
+            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -201,18 +201,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectItemsNullable = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             bool? booleanProp = default;
+            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            int? integerProp = default;
-            decimal? numberProp = default;
-            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayItemsNullable = default;
             Dictionary<string, Object> objectNullableProp = default;
-            string stringProp = default;
+            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            Dictionary<string, Object> objectItemsNullable = default;
 
             while (reader.Read())
             {
@@ -229,43 +229,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
+                        case "string_prop":
+                            stringProp = reader.GetString();
+                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -273,7 +273,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
+            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
         }
 
         /// <summary>
@@ -287,22 +287,6 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            if (nullableClass.BooleanProp != null)
-                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
-            else
-                writer.WriteNull("boolean_prop");
-            writer.WritePropertyName("date_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
-            writer.WritePropertyName("datetime_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
             if (nullableClass.IntegerProp != null)
                 writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
             else
@@ -311,11 +295,27 @@ namespace Org.OpenAPITools.Model
                 writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
             else
                 writer.WriteNull("number_prop");
-            writer.WritePropertyName("object_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            if (nullableClass.BooleanProp != null)
+                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
+            else
+                writer.WriteNull("boolean_prop");
+            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("date_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
+            writer.WritePropertyName("datetime_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
             writer.WritePropertyName("object_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
-            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("object_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index 225a89ebe9a..5799fd94e53 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="bars">bars</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
-        /// <param name="id">id</param>
         /// <param name="uuid">uuid</param>
+        /// <param name="id">id</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="bars">bars</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
+        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,18 +56,24 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Bars = bars;
-            DeprecatedRef = deprecatedRef;
-            Id = id;
             Uuid = uuid;
+            Id = id;
+            DeprecatedRef = deprecatedRef;
+            Bars = bars;
         }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Uuid
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -77,17 +83,11 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -103,10 +103,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Bars: ").Append(Bars).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Bars: ").Append(Bars).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -144,10 +144,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> bars = default;
-            DeprecatedObject deprecatedRef = default;
-            decimal id = default;
             string uuid = default;
+            decimal id = default;
+            DeprecatedObject deprecatedRef = default;
+            List<string> bars = default;
 
             while (reader.Read())
             {
@@ -164,17 +164,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
-                        case "deprecatedRef":
-                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         case "id":
                             id = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetString();
+                        case "deprecatedRef":
+                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                            break;
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
+            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
         }
 
         /// <summary>
@@ -196,12 +196,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("bars");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
             writer.WritePropertyName("deprecatedRef");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WritePropertyName("bars");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
index 67d1551e614..bedf2f03a7f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
-        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
+        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
+        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
+            MyBoolean = myBoolean;
         }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
+            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myBoolean, myNumber, myString);
+            return new OuterComposite(myNumber, myString, myBoolean);
         }
 
         /// <summary>
@@ -177,9 +177,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
index 623ba045e38..0d090017be7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
-        /// <param name="category">category</param>
-        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="status">pet status in the store</param>
+        /// <param name="id">id</param>
+        /// <param name="category">category</param>
         /// <param name="tags">tags</param>
+        /// <param name="status">pet status in the store</param>
         [JsonConstructor]
-        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
+        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,12 +64,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Category = category;
-            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Status = status;
+            Id = id;
+            Category = category;
             Tags = tags;
+            Status = status;
         }
 
         /// <summary>
@@ -141,18 +141,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("status")]
         public StatusEnum Status { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Category
-        /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
@@ -165,6 +153,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("photoUrls")]
         public List<string> PhotoUrls { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
+
         /// <summary>
         /// Gets or Sets Tags
         /// </summary>
@@ -185,12 +185,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
             sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Category category = default;
-            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            Pet.StatusEnum status = default;
+            long id = default;
+            Category category = default;
             List<Tag> tags = default;
+            Pet.StatusEnum status = default;
 
             while (reader.Read())
             {
@@ -250,32 +250,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
-                            break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
                         case "photoUrls":
                             photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
-                        case "status":
-                            string statusRawValue = reader.GetString();
-                            status = Pet.StatusEnumFromString(statusRawValue);
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "tags":
                             tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
                             break;
+                        case "status":
+                            string statusRawValue = reader.GetString();
+                            status = Pet.StatusEnumFromString(statusRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(category, id, name, photoUrls, status, tags);
+            return new Pet(name, photoUrls, id, category, tags, status);
         }
 
         /// <summary>
@@ -289,19 +289,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
+            writer.WriteNumber("id", pet.Id);
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
index 3ddbc0ada7a..fc6815b4f91 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
@@ -38,8 +38,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (returnProperty == null)
-                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
+            if (_return == null)
+                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
index 92b7dee149e..c9d60d18139 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         /// <param name="specialPropertyName">specialPropertyName</param>
+        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         [JsonConstructor]
-        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
+        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelNameProperty == null)
-                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
+            if (specialModelName == null)
+                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialModelNameProperty = specialModelNameProperty;
             SpecialPropertyName = specialPropertyName;
+            SpecialModelNameProperty = specialModelNameProperty;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialModelNameProperty
-        /// </summary>
-        [JsonPropertyName("_special_model.name_")]
-        public string SpecialModelNameProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialPropertyName
         /// </summary>
         [JsonPropertyName("$special[property.name]")]
         public long SpecialPropertyName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialModelNameProperty
+        /// </summary>
+        [JsonPropertyName("_special_model.name_")]
+        public string SpecialModelNameProperty { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string specialModelNameProperty = default;
             long specialPropertyName = default;
+            string specialModelNameProperty = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "_special_model.name_":
-                            specialModelNameProperty = reader.GetString();
-                            break;
                         case "$special[property.name]":
                             specialPropertyName = reader.GetInt64();
                             break;
+                        case "_special_model.name_":
+                            specialModelNameProperty = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
+            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
             writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
+            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
index c1b37bf1aa4..c59706d5d0c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="email">email</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="id">id</param>
+        /// <param name="username">username</param>
+        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="email">email</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="username">username</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default)
+        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object objectWithNoDeclaredPropsNullable = default, Object anyTypeProp = default, Object anyTypePropNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -79,37 +79,37 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Email = email;
-            FirstName = firstName;
             Id = id;
+            Username = username;
+            FirstName = firstName;
             LastName = lastName;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            Email = email;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            Username = username;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets FirstName
+        /// Gets or Sets Username
         /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets FirstName
         /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
+        [JsonPropertyName("firstName")]
+        public string FirstName { get; set; }
 
         /// <summary>
         /// Gets or Sets LastName
@@ -118,11 +118,10 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
+        /// Gets or Sets Email
         /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -144,10 +143,18 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// Gets or Sets Username
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
+
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -163,13 +170,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object AnyTypePropNullable { get; set; }
 
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -184,18 +184,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -233,18 +233,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string email = default;
-            string firstName = default;
             long id = default;
+            string username = default;
+            string firstName = default;
             string lastName = default;
-            Object objectWithNoDeclaredProps = default;
+            string email = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            string username = default;
+            Object objectWithNoDeclaredProps = default;
+            Object objectWithNoDeclaredPropsNullable = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
-            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -261,20 +261,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "email":
-                            email = reader.GetString();
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "password":
                             password = reader.GetString();
@@ -285,8 +285,11 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "username":
-                            username = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -294,16 +297,13 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
+            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
         }
 
         /// <summary>
@@ -317,22 +317,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("email", user.Email);
-            writer.WriteString("firstName", user.FirstName);
             writer.WriteNumber("id", user.Id);
+            writer.WriteString("username", user.Username);
+            writer.WriteString("firstName", user.FirstName);
             writer.WriteString("lastName", user.LastName);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WriteString("email", user.Email);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WriteString("username", user.Username);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
index 65d841c450c..cf0f5c871be 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
@@ -92,38 +92,31 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
-src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
-src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
-src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
-src/Org.OpenAPITools/Client/CookieContainer.cs
-src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
-src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
+src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
+src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
-src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
-src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -204,4 +197,3 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
-src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
index f9c1c7f7462..84e52ff3149 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
@@ -1 +1,265 @@
-# Created with Openapi Generator
+# Org.OpenAPITools - the C# library for the OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
+
+<a name="frameworks-supported"></a>
+## Frameworks supported
+- .NET Core >=1.0
+- .NET Framework >=4.6
+- Mono/Xamarin >=vNext
+
+<a name="dependencies"></a>
+## Dependencies
+
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
+- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
+- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
+- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
+
+The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package Newtonsoft.Json
+Install-Package JsonSubTypes
+Install-Package System.ComponentModel.Annotations
+Install-Package CompareNETObjects
+```
+<a name="installation"></a>
+## Installation
+Generate the DLL using your preferred tool (e.g. `dotnet build`)
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+```
+<a name="usage"></a>
+## Usage
+
+To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
+```csharp
+Configuration c = new Configuration();
+System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
+webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+c.Proxy = webProxy;
+```
+
+<a name="getting-started"></a>
+## Getting Started
+
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Example
+    {
+        public static void Main()
+        {
+
+            Configuration config = new Configuration();
+            config.BasePath = "http://petstore.swagger.io:80/v2";
+            var apiInstance = new AnotherFakeApi(config);
+            var modelClient = new ModelClient(); // ModelClient | client model
+
+            try
+            {
+                // To test special tags
+                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
+                Debug.WriteLine(result);
+            }
+            catch (ApiException e)
+            {
+                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
+                Debug.Print("Status Code: "+ e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+
+        }
+    }
+}
+```
+
+<a name="documentation-for-api-endpoints"></a>
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
+*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
+*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
+*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
+*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
+*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
+*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
+*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
+*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+<a name="documentation-for-models"></a>
+## Documentation for Models
+
+ - [Model.Activity](docs//modelsActivity.md)
+ - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
+ - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
+ - [Model.Animal](docs//modelsAnimal.md)
+ - [Model.ApiResponse](docs//modelsApiResponse.md)
+ - [Model.Apple](docs//modelsApple.md)
+ - [Model.AppleReq](docs//modelsAppleReq.md)
+ - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
+ - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
+ - [Model.ArrayTest](docs//modelsArrayTest.md)
+ - [Model.Banana](docs//modelsBanana.md)
+ - [Model.BananaReq](docs//modelsBananaReq.md)
+ - [Model.BasquePig](docs//modelsBasquePig.md)
+ - [Model.Capitalization](docs//modelsCapitalization.md)
+ - [Model.Cat](docs//modelsCat.md)
+ - [Model.CatAllOf](docs//modelsCatAllOf.md)
+ - [Model.Category](docs//modelsCategory.md)
+ - [Model.ChildCat](docs//modelsChildCat.md)
+ - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
+ - [Model.ClassModel](docs//modelsClassModel.md)
+ - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
+ - [Model.DanishPig](docs//modelsDanishPig.md)
+ - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
+ - [Model.Dog](docs//modelsDog.md)
+ - [Model.DogAllOf](docs//modelsDogAllOf.md)
+ - [Model.Drawing](docs//modelsDrawing.md)
+ - [Model.EnumArrays](docs//modelsEnumArrays.md)
+ - [Model.EnumClass](docs//modelsEnumClass.md)
+ - [Model.EnumTest](docs//modelsEnumTest.md)
+ - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
+ - [Model.File](docs//modelsFile.md)
+ - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
+ - [Model.Foo](docs//modelsFoo.md)
+ - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
+ - [Model.FormatTest](docs//modelsFormatTest.md)
+ - [Model.Fruit](docs//modelsFruit.md)
+ - [Model.FruitReq](docs//modelsFruitReq.md)
+ - [Model.GmFruit](docs//modelsGmFruit.md)
+ - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
+ - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
+ - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
+ - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
+ - [Model.List](docs//modelsList.md)
+ - [Model.Mammal](docs//modelsMammal.md)
+ - [Model.MapTest](docs//modelsMapTest.md)
+ - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model.Model200Response](docs//modelsModel200Response.md)
+ - [Model.ModelClient](docs//modelsModelClient.md)
+ - [Model.Name](docs//modelsName.md)
+ - [Model.NullableClass](docs//modelsNullableClass.md)
+ - [Model.NullableShape](docs//modelsNullableShape.md)
+ - [Model.NumberOnly](docs//modelsNumberOnly.md)
+ - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
+ - [Model.Order](docs//modelsOrder.md)
+ - [Model.OuterComposite](docs//modelsOuterComposite.md)
+ - [Model.OuterEnum](docs//modelsOuterEnum.md)
+ - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
+ - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
+ - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
+ - [Model.ParentPet](docs//modelsParentPet.md)
+ - [Model.Pet](docs//modelsPet.md)
+ - [Model.Pig](docs//modelsPig.md)
+ - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
+ - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
+ - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
+ - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
+ - [Model.Return](docs//modelsReturn.md)
+ - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
+ - [Model.Shape](docs//modelsShape.md)
+ - [Model.ShapeInterface](docs//modelsShapeInterface.md)
+ - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
+ - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
+ - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
+ - [Model.Tag](docs//modelsTag.md)
+ - [Model.Triangle](docs//modelsTriangle.md)
+ - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
+ - [Model.User](docs//modelsUser.md)
+ - [Model.Whale](docs//modelsWhale.md)
+ - [Model.Zebra](docs//modelsZebra.md)
+
+
+<a name="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+<a name="api_key"></a>
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+<a name="api_key_query"></a>
+### api_key_query
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+<a name="bearer_test"></a>
+### bearer_test
+
+- **Type**: Bearer Authentication
+
+<a name="http_basic_test"></a>
+### http_basic_test
+
+- **Type**: HTTP basic authentication
+
+<a name="http_signature_test"></a>
+### http_signature_test
+
+
+<a name="petstore_auth"></a>
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
index b815f20b5a0..f17e38282a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (User user, string query)
+> void TestBodyWithQueryParams (string query, User user)
 
 
 
@@ -652,12 +652,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)
             {
@@ -676,7 +676,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)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **user** | [**User**](User.md) |  |  |
 | **query** | **string** |  |  |
+| **user** | [**User**](User.md) |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, string password = null, string callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 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 _float = 3.4F;  // float? | None (optional) 
+            var _byte = 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 _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime?** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
+| **_byte** | **byte[]** | None |  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **_string** | **string** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="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, List<string> enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
             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 enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
-            var enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
+            var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
             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 enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
             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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,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, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
-| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
+| **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
 | **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg] |
 | **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg] |
+| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="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)
 
@@ -1053,17 +1053,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)
             {
@@ -1083,7 +1083,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)
 {
@@ -1097,11 +1097,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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
index da6486e4cdc..8ece47af9ca 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="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
 
@@ -689,13 +689,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)
@@ -716,7 +716,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);
@@ -734,8 +734,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
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="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)
 
@@ -784,14 +784,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)
@@ -812,7 +812,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);
@@ -829,8 +829,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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
index a862c8c112a..fd1c1a7d62b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (User user, string username)
+> void UpdateUser (string username, User user)
 
 Updated user
 
@@ -646,13 +646,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)
             {
@@ -672,7 +672,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)
 {
@@ -686,8 +686,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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
index f79869f95a7..1f919450009 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
-**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
index d89ed1a25dc..bc808ceeae3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Message** | **string** |  | [optional] 
 **Type** | **string** |  | [optional] 
+**Message** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
index ed572120cd6..32365e6d4d0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
-**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
index 9e225c17232..fde98a967ef 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
+**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**SmallCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
index 6eb0a2e13ea..c2cf3f8e919 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | [default to "default-name"]
+**Id** | **long** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
index a098828a04f..bb35816c914 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
index fcee9662afb..18117e6c938 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
 **NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
+**Shapes** | [**List&lt;Shape&gt;**](Shape.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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
index 7467f67978c..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 **JustSymbol** | **string** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
index 53bbfe31e77..71602270bab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**EnumStringRequired** | **string** |  | 
+**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**EnumString** | **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
index 78c99facf59..47e50daca3e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringProperty** | [**Foo**](Foo.md) |  | [optional] 
+**String** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
index 4e34a6d18b3..0b92c2fb10a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Binary** | **System.IO.Stream** |  | [optional] 
-**ByteProperty** | **byte[]** |  | 
+**Number** | **decimal** |  | 
+**Byte** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**DateTime** | **DateTime** |  | [optional] 
-**DecimalProperty** | **decimal** |  | [optional] 
-**DoubleProperty** | **double** |  | [optional] 
-**FloatProperty** | **float** |  | [optional] 
+**Password** | **string** |  | 
+**Integer** | **int** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Integer** | **int** |  | [optional] 
-**Number** | **decimal** |  | 
-**Password** | **string** |  | 
+**Float** | **float** |  | [optional] 
+**Double** | **double** |  | [optional] 
+**Decimal** | **decimal** |  | [optional] 
+**String** | **string** |  | [optional] 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**Uuid** | **Guid** |  | [optional] 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
-**StringProperty** | **string** |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
index 5dd27228bb0..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
-**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
+**DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 0bac85a8e83..031d2b96065 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
-**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
index 93139e1d1aa..8bc8049f46f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
+**Class** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
index 51cf0636e72..9e0e83645f3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_ClientProperty** | **string** |  | [optional] 
+**_Client** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
index 11f49b9fd40..2ee782c0c54 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**Property** | **string** |  | [optional] 
 **SnakeCase** | **int** |  | [optional] [readonly] 
+**Property** | **string** |  | [optional] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
index ac86336ea70..d4a19d1856b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
+**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
-**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
+**ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
index 9f44c24d19a..b737f7d757a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bars** | **List&lt;string&gt;** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
-**Id** | **decimal** |  | [optional] 
 **Uuid** | **string** |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Bars** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
index 8985c59d094..abf676810fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
+**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
index b13bb576b45..7de10304abf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Status** | **string** | pet status in the store | [optional] 
+**Id** | **long** |  | [optional] 
+**Category** | [**Category**](Category.md) |  | [optional] 
 **Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
index b48f3490005..662fa6f4a38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialModelNameProperty** | **string** |  | [optional] 
 **SpecialPropertyName** | **long** |  | [optional] 
+**SpecialModelNameProperty** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
index 455f031674d..a0f0d223899 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Email** | **string** |  | [optional] 
-**FirstName** | **string** |  | [optional] 
 **Id** | **long** |  | [optional] 
+**Username** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**Email** | **string** |  | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**Username** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 4c37cee2cda..2bd996bd4d3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,15 +174,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -214,7 +205,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
index c017ba3eccb..15d8dd9dae1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -59,7 +59,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool&gt;&gt;</returns>
-        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal&gt;&gt;</returns>
-        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -177,7 +177,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -189,7 +189,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -198,11 +198,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -211,11 +211,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -227,7 +227,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -239,7 +239,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -248,23 +248,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -273,23 +273,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -300,15 +300,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -319,15 +319,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -336,15 +336,15 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -353,15 +353,15 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -373,7 +373,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -385,7 +385,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -398,7 +398,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -411,7 +411,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -427,7 +427,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -657,7 +657,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -707,7 +707,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -932,7 +932,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -982,7 +982,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1315,7 +1315,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1332,7 +1332,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1355,15 +1355,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (fileSchemaTestClass == null)
-                throw new ArgumentNullException(nameof(fileSchemaTestClass));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return fileSchemaTestClass;
         }
 
@@ -1395,7 +1386,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1460,13 +1451,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1478,16 +1469,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1501,33 +1492,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="query"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
+        protected virtual (string, User) OnTestBodyWithQueryParams(string query, User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (query == null)
-                throw new ArgumentNullException(nameof(query));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, query);
+            return (query, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, string query, User user)
         {
         }
 
@@ -1537,9 +1516,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="query"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
+        /// <param name="user"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string query, User user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1548,19 +1527,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(user, query);
-                user = validatedParameters.Item1;
-                query = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(query, user);
+                query = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1607,7 +1586,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, user, query);
+                            AfterTestBodyWithQueryParams(apiResponse, query, user);
                         }
 
                         return apiResponse;
@@ -1616,7 +1595,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
                 throw;
             }
         }
@@ -1628,7 +1607,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1645,7 +1624,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -1668,15 +1647,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -1708,7 +1678,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1782,25 +1752,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1812,28 +1782,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1847,63 +1817,45 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream, float?, int?, int?, long?, string, string, string, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual (decimal, double, string, byte[], int?, int?, long?, float?, string, System.IO.Stream, DateTime?, string, string, DateTime?) OnTestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (_byte == null)
-                throw new ArgumentNullException(nameof(_byte));
-
-            if (number == null)
-                throw new ArgumentNullException(nameof(number));
-
-            if (_double == null)
-                throw new ArgumentNullException(nameof(_double));
-
-            if (patternWithoutDelimiter == null)
-                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
         }
 
@@ -1913,21 +1865,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="date"></param>
-        /// <param name="binary"></param>
-        /// <param name="_float"></param>
+        /// <param name="_byte"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
+        /// <param name="_float"></param>
         /// <param name="_string"></param>
+        /// <param name="binary"></param>
+        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1936,40 +1888,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="date">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
+        /// <param name="_byte">None</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
-                _byte = validatedParameters.Item1;
-                number = validatedParameters.Item2;
-                _double = validatedParameters.Item3;
-                patternWithoutDelimiter = validatedParameters.Item4;
-                date = validatedParameters.Item5;
-                binary = validatedParameters.Item6;
-                _float = validatedParameters.Item7;
-                integer = validatedParameters.Item8;
-                int32 = validatedParameters.Item9;
-                int64 = validatedParameters.Item10;
-                _string = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                number = validatedParameters.Item1;
+                _double = validatedParameters.Item2;
+                patternWithoutDelimiter = validatedParameters.Item3;
+                _byte = validatedParameters.Item4;
+                integer = validatedParameters.Item5;
+                int32 = validatedParameters.Item6;
+                int64 = validatedParameters.Item7;
+                _float = validatedParameters.Item8;
+                _string = validatedParameters.Item9;
+                binary = validatedParameters.Item10;
+                date = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -1989,10 +1941,6 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
-                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
-
-
-
                     formParams.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -2003,14 +1951,9 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
+                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer)));
@@ -2021,9 +1964,18 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64)));
 
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
+
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(_string)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
+
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
+
                     if (password != null)
                         formParams.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password)));
 
@@ -2069,7 +2021,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2081,7 +2033,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
                 throw;
             }
         }
@@ -2092,17 +2044,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2116,20 +2068,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2145,16 +2097,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>, List<string>, double?, int?, List<string>, string, string, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual (List<string>, List<string>, int?, double?, string, string, List<string>, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
         }
 
         /// <summary>
@@ -2163,13 +2115,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
         }
 
@@ -2181,13 +2133,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryDouble"></param>
         /// <param name="enumQueryInteger"></param>
-        /// <param name="enumFormStringArray"></param>
+        /// <param name="enumQueryDouble"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2198,28 +2150,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryDouble">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryInteger">Query parameter enum test (double) (optional)</param>
-        /// <param name="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</param>
+        /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryDouble = validatedParameters.Item3;
-                enumQueryInteger = validatedParameters.Item4;
-                enumFormStringArray = validatedParameters.Item5;
-                enumHeaderString = validatedParameters.Item6;
-                enumQueryString = validatedParameters.Item7;
+                enumQueryInteger = validatedParameters.Item3;
+                enumQueryDouble = validatedParameters.Item4;
+                enumHeaderString = validatedParameters.Item5;
+                enumQueryString = validatedParameters.Item6;
+                enumFormStringArray = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2233,12 +2185,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString());
 
-                    if (enumQueryDouble != null)
-                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
-
                     if (enumQueryInteger != null)
                         parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
 
+                    if (enumQueryDouble != null)
+                        parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString());
 
@@ -2290,7 +2242,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                         }
 
                         return apiResponse;
@@ -2299,7 +2251,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
                 throw;
             }
         }
@@ -2308,17 +2260,17 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2330,20 +2282,20 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2357,44 +2309,29 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <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>
         /// <returns></returns>
-        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual (int, bool, long, int?, bool?, long?) OnTestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredBooleanGroup == null)
-                throw new ArgumentNullException(nameof(requiredBooleanGroup));
-
-            if (requiredStringGroup == null)
-                throw new ArgumentNullException(nameof(requiredStringGroup));
-
-            if (requiredInt64Group == null)
-                throw new ArgumentNullException(nameof(requiredInt64Group));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></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>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
         }
 
@@ -2404,13 +2341,13 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2419,26 +2356,26 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
-                requiredBooleanGroup = validatedParameters.Item1;
-                requiredStringGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                requiredStringGroup = validatedParameters.Item1;
+                requiredBooleanGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                booleanGroup = validatedParameters.Item4;
-                stringGroup = validatedParameters.Item5;
+                stringGroup = validatedParameters.Item4;
+                booleanGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2493,7 +2430,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2505,7 +2442,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
                 throw;
             }
         }
@@ -2517,7 +2454,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2534,7 +2471,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2557,15 +2494,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requestBody == null)
-                throw new ArgumentNullException(nameof(requestBody));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return requestBody;
         }
 
@@ -2597,7 +2525,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2666,7 +2594,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2684,7 +2612,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2708,18 +2636,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnTestJsonFormData(string param, string param2)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (param == null)
-                throw new ArgumentNullException(nameof(param));
-
-            if (param2 == null)
-                throw new ArgumentNullException(nameof(param2));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (param, param2);
         }
 
@@ -2754,7 +2670,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2838,7 +2754,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -2859,7 +2775,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2886,27 +2802,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pipe == null)
-                throw new ArgumentNullException(nameof(pipe));
-
-            if (ioutil == null)
-                throw new ArgumentNullException(nameof(ioutil));
-
-            if (http == null)
-                throw new ArgumentNullException(nameof(http));
-
-            if (url == null)
-                throw new ArgumentNullException(nameof(url));
-
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (pipe, ioutil, http, url, context);
         }
 
@@ -2950,7 +2845,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index d7ae312c657..e84ca4b30db 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,15 +174,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClassname(ModelClient modelClient)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (modelClient == null)
-                throw new ArgumentNullException(nameof(modelClient));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return modelClient;
         }
 
@@ -214,7 +205,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
index b858b1d8430..0b2d70f2449 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -87,7 +87,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -99,7 +99,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -111,7 +111,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet&gt;&gt;</returns>
-        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -185,7 +185,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -209,11 +209,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -250,12 +250,12 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -340,7 +340,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -357,7 +357,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -380,15 +380,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnAddPet(Pet pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -420,7 +411,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -512,7 +503,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -530,7 +521,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -554,15 +545,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string) OnDeletePet(long petId, string apiKey)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, apiKey);
         }
 
@@ -597,7 +579,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -668,7 +650,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -685,7 +667,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -708,15 +690,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByStatus(List<string> status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (status == null)
-                throw new ArgumentNullException(nameof(status));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return status;
         }
 
@@ -748,7 +721,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -841,7 +814,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -858,7 +831,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -881,15 +854,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByTags(List<string> tags)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (tags == null)
-                throw new ArgumentNullException(nameof(tags));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return tags;
         }
 
@@ -921,7 +885,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1014,7 +978,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -1031,7 +995,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = null;
             try 
@@ -1054,15 +1018,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetPetById(long petId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return petId;
         }
 
@@ -1094,7 +1049,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1168,7 +1123,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1185,7 +1140,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1208,15 +1163,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnUpdatePet(Pet pet)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (pet == null)
-                throw new ArgumentNullException(nameof(pet));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return pet;
         }
 
@@ -1248,7 +1194,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1341,7 +1287,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1360,7 +1306,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1385,15 +1331,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string, string) OnUpdatePetWithForm(long petId, string name, string status)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (petId, name, status);
         }
 
@@ -1431,7 +1368,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1519,13 +1456,13 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1538,16 +1475,16 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1562,21 +1499,12 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
+        /// <param name="file"></param>
         /// <returns></returns>
-        protected virtual (long, System.IO.Stream, string) OnUploadFile(long petId, System.IO.Stream file, string additionalMetadata)
+        protected virtual (long, string, System.IO.Stream) OnUploadFile(long petId, string additionalMetadata, System.IO.Stream file)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (petId, file, additionalMetadata);
+            return (petId, additionalMetadata, file);
         }
 
         /// <summary>
@@ -1584,9 +1512,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream file, string additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, string additionalMetadata, System.IO.Stream file)
         {
         }
 
@@ -1597,9 +1525,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="file"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream file, string additionalMetadata)
+        /// <param name="file"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, string additionalMetadata, System.IO.Stream file)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1609,20 +1537,20 @@ namespace Org.OpenAPITools.Api
         /// </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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
+                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
                 petId = validatedParameters.Item1;
-                file = validatedParameters.Item2;
-                additionalMetadata = validatedParameters.Item3;
+                additionalMetadata = validatedParameters.Item2;
+                file = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1637,12 +1565,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string, string>> formParams = new List<KeyValuePair<string, string>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
-                        multipartContent.Add(new StreamContent(file));
-
-                    if (additionalMetadata != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
                         formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
 
+                    if (file != null)
+                        multipartContent.Add(new StreamContent(file));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1688,7 +1616,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
+                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1700,7 +1628,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
                 throw;
             }
         }
@@ -1709,14 +1637,14 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1728,17 +1656,17 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1752,35 +1680,23 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (System.IO.Stream, long, string) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual (long, System.IO.Stream, string) OnUploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (requiredFile == null)
-                throw new ArgumentNullException(nameof(requiredFile));
-
-            if (petId == null)
-                throw new ArgumentNullException(nameof(petId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (requiredFile, petId, additionalMetadata);
+            return (petId, requiredFile, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredFile"></param>
         /// <param name="petId"></param>
+        /// <param name="requiredFile"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
         }
 
@@ -1790,10 +1706,10 @@ namespace Org.OpenAPITools.Api
         /// <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>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1802,20 +1718,20 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
-                requiredFile = validatedParameters.Item1;
-                petId = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                petId = validatedParameters.Item1;
+                requiredFile = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1882,7 +1798,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1894,7 +1810,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
index 07af6e52b76..3006d290b33 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -95,7 +95,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -204,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -221,7 +221,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -244,15 +244,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteOrder(string orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -284,7 +275,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -457,7 +448,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -474,7 +465,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -497,15 +488,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetOrderById(long orderId)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (orderId == null)
-                throw new ArgumentNullException(nameof(orderId));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return orderId;
         }
 
@@ -537,7 +519,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -602,7 +584,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -619,7 +601,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -642,15 +624,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Order OnPlaceOrder(Order order)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (order == null)
-                throw new ArgumentNullException(nameof(order));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return order;
         }
 
@@ -682,7 +655,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
index 88d04ddaf5d..8cd07b7db44 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -73,7 +73,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -85,7 +85,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User&gt;&gt;</returns>
-        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -158,7 +158,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string&gt;&gt;</returns>
-        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -202,11 +202,11 @@ namespace Org.OpenAPITools.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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -215,11 +215,11 @@ namespace Org.OpenAPITools.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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -304,7 +304,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -321,7 +321,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -344,15 +344,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual User OnCreateUser(User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -384,7 +375,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -452,7 +443,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -469,7 +460,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -492,15 +483,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -532,7 +514,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -600,7 +582,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -617,7 +599,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -640,15 +622,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return user;
         }
 
@@ -680,7 +653,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -748,7 +721,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -765,7 +738,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -788,15 +761,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteUser(string username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -828,7 +792,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -883,7 +847,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -900,7 +864,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = null;
             try 
@@ -923,15 +887,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnGetUserByName(string username)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return username;
         }
 
@@ -963,7 +918,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1029,7 +984,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1049,18 +1004,6 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnLoginUser(string username, string password)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            if (password == null)
-                throw new ArgumentNullException(nameof(password));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
             return (username, password);
         }
 
@@ -1095,7 +1038,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1286,13 +1229,13 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1304,16 +1247,16 @@ namespace Org.OpenAPITools.Api
         /// 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="object"/>&gt;</returns>
-        public async Task<object> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1327,33 +1270,21 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="user"></param>
         /// <param name="username"></param>
+        /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual (User, string) OnUpdateUser(User user, string username)
+        protected virtual (string, User) OnUpdateUser(string username, User user)
         {
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-
-            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
-            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
-
-            return (user, username);
+            return (username, user);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, string username, User user)
         {
         }
 
@@ -1363,9 +1294,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="user"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
+        /// <param name="user"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string username, User user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1374,19 +1305,19 @@ namespace Org.OpenAPITools.Api
         /// 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(user, username);
-                user = validatedParameters.Item1;
-                username = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(username, user);
+                username = validatedParameters.Item1;
+                user = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1427,7 +1358,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, user, username);
+                            AfterUpdateUser(apiResponse, username, user);
                         }
 
                         return apiResponse;
@@ -1436,7 +1367,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/IApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/IApi.cs
new file mode 100644
index 00000000000..038f19bcfa1
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/IApi.cs
@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+namespace Org.OpenAPITools.IApi
+{
+    /// <summary>
+    /// Any Api client
+    /// </summary>
+    public interface IApi
+    {
+        /// <summary>
+        /// The HttpClient
+        /// </summary>
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
new file mode 100644
index 00000000000..a5253e58201
--- /dev/null
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
@@ -0,0 +1,29 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using Newtonsoft.Json.Converters;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class OpenAPIDateConverter : IsoDateTimeConverter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenAPIDateConverter" /> class.
+        /// </summary>
+        public OpenAPIDateConverter()
+        {
+            // full-date   = date-fullyear "-" date-month "-" date-mday
+            DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 5682c09e840..267679a9928 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -31,16 +31,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
         /// <param name="mapProperty">mapProperty</param>
+        /// <param name="mapOfMapProperty">mapOfMapProperty</param>
+        /// <param name="anytype1">anytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
-        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object anytype1 = default)
+        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -69,22 +69,21 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EmptyMap = emptyMap;
-            MapOfMapProperty = mapOfMapProperty;
             MapProperty = mapProperty;
+            MapOfMapProperty = mapOfMapProperty;
+            Anytype1 = anytype1;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
+            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
-            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
+        /// Gets or Sets MapProperty
         /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -93,10 +92,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets Anytype1
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        [JsonPropertyName("anytype_1")]
+        public Object Anytype1 { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -117,16 +116,17 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapWithUndeclaredPropertiesString
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_with_undeclared_properties_string")]
-        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object Anytype1 { get; set; }
+        [JsonPropertyName("map_with_undeclared_properties_string")]
+        public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -142,14 +142,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
             sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -187,14 +187,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Object emptyMap = default;
-            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
             Dictionary<string, string> mapProperty = default;
+            Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
+            Object anytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
+            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
-            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -211,14 +211,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -229,19 +229,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
+            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
         }
 
         /// <summary>
@@ -255,22 +255,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
-            writer.WritePropertyName("map_of_map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
             writer.WritePropertyName("map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("map_of_map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
index 3610a2a0bec..73eee830ea0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -32,10 +32,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="message">message</param>
         /// <param name="type">type</param>
+        /// <param name="message">message</param>
         [JsonConstructor]
-        public ApiResponse(int code, string message, string type)
+        public ApiResponse(int code, string type, string message)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -53,8 +53,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Message = message;
             Type = type;
+            Message = message;
         }
 
         /// <summary>
@@ -63,18 +63,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Message
-        /// </summary>
-        [JsonPropertyName("message")]
-        public string Message { get; set; }
-
         /// <summary>
         /// Gets or Sets Type
         /// </summary>
         [JsonPropertyName("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Message
+        /// </summary>
+        [JsonPropertyName("message")]
+        public string Message { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -90,8 +90,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -130,8 +130,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string message = default;
             string type = default;
+            string message = default;
 
             while (reader.Read())
             {
@@ -151,19 +151,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "message":
-                            message = reader.GetString();
-                            break;
                         case "type":
                             type = reader.GetString();
                             break;
+                        case "message":
+                            message = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, message, type);
+            return new ApiResponse(code, type, message);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("message", apiResponse.Message);
             writer.WriteString("type", apiResponse.Type);
+            writer.WriteString("message", apiResponse.Message);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
index ef26590ab3c..d628f7aac0b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
+        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
-        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
+        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
-            ArrayOfString = arrayOfString;
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
-            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
+            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
         }
 
         /// <summary>
@@ -177,12 +177,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
index 0d25bc70612..8cb011aa50c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
         /// <param name="capitalCamel">capitalCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="smallCamel">smallCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         [JsonConstructor]
-        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
+        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,20 +64,19 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
             CapitalCamel = capitalCamel;
+            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            SmallCamel = smallCamel;
-            SmallSnake = smallSnake;
+            ATT_NAME = aTTNAME;
         }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -85,6 +84,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
+
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -98,16 +103,11 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
-        /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
-
-        /// <summary>
-        /// Gets or Sets SmallSnake
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -123,12 +123,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -166,12 +166,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string aTTNAME = default;
+            string smallCamel = default;
             string capitalCamel = default;
+            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string smallCamel = default;
-            string smallSnake = default;
+            string aTTNAME = default;
 
             while (reader.Read())
             {
@@ -188,23 +188,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
+                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
-                            break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         default:
                             break;
@@ -212,7 +212,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
+            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
         }
 
         /// <summary>
@@ -226,12 +226,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
index 113fd3d276d..444fbaaccdb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="id">id</param>
         /// <param name="name">name (default to &quot;default-name&quot;)</param>
+        /// <param name="id">id</param>
         [JsonConstructor]
-        public Category(long id, string name = "default-name")
+        public Category(string name = "default-name", long id)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,22 +48,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
             Name = name;
+            Id = id;
         }
 
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
             string name = default;
+            long id = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(id, name);
+            return new Category(name, id);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", category.Id);
             writer.WriteString("name", category.Name);
+            writer.WriteNumber("id", category.Id);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
index be70d0da28b..81fd55bd903 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public ClassModel(string classProperty)
+        public ClassModel(string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
+            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets ClassProperty
+        /// Gets or Sets Class
         /// </summary>
         [JsonPropertyName("_class")]
-        public string ClassProperty { get; set; }
+        public string Class { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            classProperty = reader.GetString();
+                            _class = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(classProperty);
+            return new ClassModel(_class);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.ClassProperty);
+            writer.WriteString("_class", classModel.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
index 6de00f19504..4d107d8d323 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="shapes">shapes</param>
         /// <param name="nullableShape">nullableShape</param>
+        /// <param name="shapes">shapes</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape nullableShape = default) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape nullableShape = default, List<Shape> shapes) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            Shapes = shapes;
             NullableShape = nullableShape;
+            Shapes = shapes;
         }
 
         /// <summary>
@@ -71,18 +71,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Shapes
-        /// </summary>
-        [JsonPropertyName("shapes")]
-        public List<Shape> Shapes { get; set; }
-
         /// <summary>
         /// Gets or Sets NullableShape
         /// </summary>
         [JsonPropertyName("nullableShape")]
         public NullableShape NullableShape { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Shapes
+        /// </summary>
+        [JsonPropertyName("shapes")]
+        public List<Shape> Shapes { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -94,8 +94,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
+            sb.Append("  Shapes: ").Append(Shapes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -134,8 +134,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            List<Shape> shapes = default;
             NullableShape nullableShape = default;
+            List<Shape> shapes = default;
 
             while (reader.Read())
             {
@@ -158,19 +158,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "shapes":
-                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
-                            break;
                         case "nullableShape":
                             nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
                             break;
+                        case "shapes":
+                            shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
+            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
         }
 
         /// <summary>
@@ -188,10 +188,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("shapes");
-            JsonSerializer.Serialize(writer, drawing.Shapes, options);
             writer.WritePropertyName("nullableShape");
             JsonSerializer.Serialize(writer, drawing.NullableShape, options);
+            writer.WritePropertyName("shapes");
+            JsonSerializer.Serialize(writer, drawing.Shapes, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index c6dcd8b5b24..724ee8139bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="arrayEnum">arrayEnum</param>
         /// <param name="justSymbol">justSymbol</param>
+        /// <param name="arrayEnum">arrayEnum</param>
         [JsonConstructor]
-        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
+        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,41 +48,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayEnum = arrayEnum;
             JustSymbol = justSymbol;
+            ArrayEnum = arrayEnum;
         }
 
         /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -91,48 +91,54 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Gets or Sets JustSymbol
         /// </summary>
-        public enum JustSymbolEnum
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
+        /// <summary>
+        /// Defines ArrayEnum
+        /// </summary>
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -141,23 +147,17 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
+            sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -217,8 +217,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
             EnumArrays.JustSymbolEnum justSymbol = default;
+            List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
 
             while (reader.Read())
             {
@@ -235,20 +235,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(arrayEnum, justSymbol);
+            return new EnumArrays(justSymbol, arrayEnum);
         }
 
         /// <summary>
@@ -262,13 +262,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 9c13e1739d1..530cc907a07 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -31,17 +31,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
+        /// <param name="enumStringRequired">enumStringRequired</param>
+        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="enumString">enumString</param>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
-        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
+        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -73,48 +73,56 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            EnumStringRequired = enumStringRequired;
+            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            EnumString = enumString;
-            EnumStringRequired = enumStringRequired;
-            OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnum = outerEnum;
             OuterEnumInteger = outerEnumInteger;
+            OuterEnumDefaultValue = outerEnumDefaultValue;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
-            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -123,48 +131,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            return (int) value;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -173,48 +198,57 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -223,62 +257,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
-
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -287,65 +307,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            Lower = 2,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -354,31 +357,28 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
 
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
+        /// Gets or Sets OuterEnum
         /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -387,16 +387,16 @@ namespace Org.OpenAPITools.Model
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnumIntegerDefaultValue
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnumIntegerDefaultValue")]
-        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumIntegerDefaultValue")]
+        public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -412,15 +412,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -458,15 +458,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
+            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            EnumTest.EnumStringEnum enumString = default;
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnum? outerEnum = default;
             OuterEnumInteger outerEnumInteger = default;
+            OuterEnumDefaultValue outerEnumDefaultValue = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
-            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -483,6 +483,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                            break;
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -492,37 +500,29 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
-                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
+            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
         }
 
         /// <summary>
@@ -536,41 +536,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
-            if (enumStringRawValue != null)
-                writer.WriteString("enum_string", enumStringRawValue);
-            else
-                writer.WriteNull("enum_string");
             var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
             if (enumStringRequiredRawValue != null)
                 writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
                 writer.WriteNull("enum_string_required");
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
-            if (outerEnumDefaultValueRawValue != null)
-                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
+            if (enumStringRawValue != null)
+                writer.WriteString("enum_string", enumStringRawValue);
             else
-                writer.WriteNull("outerEnumDefaultValue");
+                writer.WriteNull("enum_string");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
             var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
             if (outerEnumIntegerRawValue != null)
                 writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
             else
                 writer.WriteNull("outerEnumInteger");
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            if (outerEnumDefaultValueRawValue != null)
+                writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
+            else
+                writer.WriteNull("outerEnumDefaultValue");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index a17a59ac541..bf0b8bec3f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="_string">_string</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo stringProperty)
+        public FooGetDefaultResponse(Foo _string)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            StringProperty = stringProperty;
+            String = _string;
         }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets String
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo StringProperty { get; set; }
+        public Foo String { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo stringProperty = default;
+            Foo _string = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(stringProperty);
+            return new FooGetDefaultResponse(_string);
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
index 3b28c9e5a5c..d0dd73bfe2e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -31,24 +31,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="binary">binary</param>
-        /// <param name="byteProperty">byteProperty</param>
+        /// <param name="number">number</param>
+        /// <param name="_byte">_byte</param>
         /// <param name="date">date</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="decimalProperty">decimalProperty</param>
-        /// <param name="doubleProperty">doubleProperty</param>
-        /// <param name="floatProperty">floatProperty</param>
+        /// <param name="password">password</param>
+        /// <param name="integer">integer</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="integer">integer</param>
-        /// <param name="number">number</param>
-        /// <param name="password">password</param>
+        /// <param name="_float">_float</param>
+        /// <param name="_double">_double</param>
+        /// <param name="_decimal">_decimal</param>
+        /// <param name="_string">_string</param>
+        /// <param name="binary">binary</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="uuid">uuid</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
-        /// <param name="stringProperty">stringProperty</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
+        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -65,20 +65,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (floatProperty == null)
-                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
+            if (_float == null)
+                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
 
-            if (doubleProperty == null)
-                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
+            if (_double == null)
+                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
 
-            if (decimalProperty == null)
-                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
+            if (_decimal == null)
+                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
 
-            if (stringProperty == null)
-                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
+            if (_string == null)
+                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
 
-            if (byteProperty == null)
-                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
+            if (_byte == null)
+                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -104,35 +104,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Binary = binary;
-            ByteProperty = byteProperty;
+            Number = number;
+            Byte = _byte;
             Date = date;
-            DateTime = dateTime;
-            DecimalProperty = decimalProperty;
-            DoubleProperty = doubleProperty;
-            FloatProperty = floatProperty;
+            Password = password;
+            Integer = integer;
             Int32 = int32;
             Int64 = int64;
-            Integer = integer;
-            Number = number;
-            Password = password;
+            Float = _float;
+            Double = _double;
+            Decimal = _decimal;
+            String = _string;
+            Binary = binary;
+            DateTime = dateTime;
+            Uuid = uuid;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
-            StringProperty = stringProperty;
-            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets ByteProperty
+        /// Gets or Sets Byte
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] ByteProperty { get; set; }
+        public byte[] Byte { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -141,28 +141,16 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
-        /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DecimalProperty
-        /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal DecimalProperty { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DoubleProperty
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("double")]
-        public double DoubleProperty { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
-        /// Gets or Sets FloatProperty
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("float")]
-        public float FloatProperty { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
         /// Gets or Sets Int32
@@ -177,42 +165,40 @@ namespace Org.OpenAPITools.Model
         public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets Float
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
+        [JsonPropertyName("float")]
+        public float Float { get; set; }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Double
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("double")]
+        public double Double { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets Decimal
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal Decimal { get; set; }
 
         /// <summary>
-        /// A string that is a 10 digit number. Can have leading zeros.
+        /// Gets or Sets String
         /// </summary>
-        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
-        [JsonPropertyName("pattern_with_digits")]
-        public string PatternWithDigits { get; set; }
+        [JsonPropertyName("string")]
+        public string String { get; set; }
 
         /// <summary>
-        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// Gets or Sets Binary
         /// </summary>
-        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
-        [JsonPropertyName("pattern_with_digits_and_delimiter")]
-        public string PatternWithDigitsAndDelimiter { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProperty
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("string")]
-        public string StringProperty { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
         /// Gets or Sets Uuid
@@ -220,6 +206,20 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("uuid")]
         public Guid Uuid { get; set; }
 
+        /// <summary>
+        /// A string that is a 10 digit number. Can have leading zeros.
+        /// </summary>
+        /// <value>A string that is a 10 digit number. Can have leading zeros.</value>
+        [JsonPropertyName("pattern_with_digits")]
+        public string PatternWithDigits { get; set; }
+
+        /// <summary>
+        /// A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
+        /// </summary>
+        /// <value>A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</value>
+        [JsonPropertyName("pattern_with_digits_and_delimiter")]
+        public string PatternWithDigitsAndDelimiter { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -234,22 +234,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Byte: ").Append(Byte).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
-            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
-            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
+            sb.Append("  Float: ").Append(Float).Append("\n");
+            sb.Append("  Double: ").Append(Double).Append("\n");
+            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
+            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
-            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -261,28 +261,40 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // DoubleProperty (double) maximum
-            if (this.DoubleProperty > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+            }
+
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+            }
+
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
             }
 
-            // DoubleProperty (double) minimum
-            if (this.DoubleProperty < (double)67.8)
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
-            // FloatProperty (float) maximum
-            if (this.FloatProperty > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // FloatProperty (float) minimum
-            if (this.FloatProperty < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
             // Int32 (int) maximum
@@ -297,40 +309,35 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // Float (float) maximum
+            if (this.Float > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // Float (float) minimum
+            if (this.Float < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
             }
 
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
+            // Double (double) maximum
+            if (this.Double > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
             }
 
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // Double (double) minimum
+            if (this.Double < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
             }
 
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
-            }
-
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // String (string) pattern
+            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexString.Match(this.String).Success)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
             }
 
             // PatternWithDigits (string) pattern
@@ -347,13 +354,6 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
-            // StringProperty (string) pattern
-            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexStringProperty.Match(this.StringProperty).Success)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
-            }
-
             yield break;
         }
     }
@@ -380,22 +380,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            System.IO.Stream binary = default;
-            byte[] byteProperty = default;
+            decimal number = default;
+            byte[] _byte = default;
             DateTime date = default;
-            DateTime dateTime = default;
-            decimal decimalProperty = default;
-            double doubleProperty = default;
-            float floatProperty = default;
+            string password = default;
+            int integer = default;
             int int32 = default;
             long int64 = default;
-            int integer = default;
-            decimal number = default;
-            string password = default;
+            float _float = default;
+            double _double = default;
+            decimal _decimal = default;
+            string _string = default;
+            System.IO.Stream binary = default;
+            DateTime dateTime = default;
+            Guid uuid = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
-            string stringProperty = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -412,26 +412,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
                         case "byte":
-                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
-                            break;
-                        case "decimal":
-                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "double":
-                            doubleProperty = reader.GetDouble();
+                        case "password":
+                            password = reader.GetString();
                             break;
-                        case "float":
-                            floatProperty = (float)reader.GetDouble();
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -439,34 +433,40 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "float":
+                            _float = (float)reader.GetDouble();
                             break;
-                        case "number":
-                            number = reader.GetInt32();
+                        case "double":
+                            _double = reader.GetDouble();
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "decimal":
+                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
                             break;
-                        case "pattern_with_digits":
-                            patternWithDigits = reader.GetString();
+                        case "string":
+                            _string = reader.GetString();
                             break;
-                        case "pattern_with_digits_and_delimiter":
-                            patternWithDigitsAndDelimiter = reader.GetString();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
-                        case "string":
-                            stringProperty = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "uuid":
                             uuid = reader.GetGuid();
                             break;
+                        case "pattern_with_digits":
+                            patternWithDigits = reader.GetString();
+                            break;
+                        case "pattern_with_digits_and_delimiter":
+                            patternWithDigitsAndDelimiter = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
+            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
         }
 
         /// <summary>
@@ -480,27 +480,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WriteNumber("number", formatTest.Number);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
+            JsonSerializer.Serialize(writer, formatTest.Byte, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WritePropertyName("dateTime");
-            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
-            writer.WriteNumber("double", formatTest.DoubleProperty);
-            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("integer", formatTest.Integer);
             writer.WriteNumber("int32", formatTest.Int32);
             writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("number", formatTest.Number);
-            writer.WriteString("password", formatTest.Password);
+            writer.WriteNumber("float", formatTest.Float);
+            writer.WriteNumber("double", formatTest.Double);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
+            writer.WriteString("string", formatTest.String);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
+            writer.WritePropertyName("dateTime");
+            JsonSerializer.Serialize(writer, formatTest.DateTime, options);
+            writer.WriteString("uuid", formatTest.Uuid);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
-            writer.WriteString("string", formatTest.StringProperty);
-            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
index 777120531d2..413f56633ab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="directMap">directMap</param>
-        /// <param name="indirectMap">indirectMap</param>
         /// <param name="mapMapOfString">mapMapOfString</param>
         /// <param name="mapOfEnumString">mapOfEnumString</param>
+        /// <param name="directMap">directMap</param>
+        /// <param name="indirectMap">indirectMap</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
+        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,10 +56,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            DirectMap = directMap;
-            IndirectMap = indirectMap;
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
+            DirectMap = directMap;
+            IndirectMap = indirectMap;
         }
 
         /// <summary>
@@ -112,18 +112,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets DirectMap
-        /// </summary>
-        [JsonPropertyName("direct_map")]
-        public Dictionary<string, bool> DirectMap { get; set; }
-
-        /// <summary>
-        /// Gets or Sets IndirectMap
-        /// </summary>
-        [JsonPropertyName("indirect_map")]
-        public Dictionary<string, bool> IndirectMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
@@ -136,6 +124,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_of_enum_string")]
         public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets DirectMap
+        /// </summary>
+        [JsonPropertyName("direct_map")]
+        public Dictionary<string, bool> DirectMap { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IndirectMap
+        /// </summary>
+        [JsonPropertyName("indirect_map")]
+        public Dictionary<string, bool> IndirectMap { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -150,10 +150,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
-            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
             sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
+            sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
+            sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -191,10 +191,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, bool> directMap = default;
-            Dictionary<string, bool> indirectMap = default;
             Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
             Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
+            Dictionary<string, bool> directMap = default;
+            Dictionary<string, bool> indirectMap = default;
 
             while (reader.Read())
             {
@@ -211,25 +211,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "direct_map":
-                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
-                        case "indirect_map":
-                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
-                            break;
                         case "map_map_of_string":
                             mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
                         case "map_of_enum_string":
                             mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
                             break;
+                        case "direct_map":
+                            directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
+                        case "indirect_map":
+                            indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
+            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
         }
 
         /// <summary>
@@ -243,14 +243,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("direct_map");
-            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
-            writer.WritePropertyName("indirect_map");
-            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
             writer.WritePropertyName("map_map_of_string");
             JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
             writer.WritePropertyName("map_of_enum_string");
             JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
+            writer.WritePropertyName("direct_map");
+            JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
+            writer.WritePropertyName("indirect_map");
+            JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 4806980e331..520c4896c8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
+        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
-        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
+        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
-            Uuid = uuid;
         }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
-            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
+            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
         }
 
         /// <summary>
@@ -177,11 +177,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
index e4e9a8611ab..e805657a406 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
-        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
+        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(string classProperty, int name)
+        public Model200Response(int name, string _class)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (classProperty == null)
-                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
+            if (_class == null)
+                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ClassProperty = classProperty;
             Name = name;
+            Class = _class;
         }
 
-        /// <summary>
-        /// Gets or Sets ClassProperty
-        /// </summary>
-        [JsonPropertyName("class")]
-        public string ClassProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         [JsonPropertyName("name")]
         public int Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Class
+        /// </summary>
+        [JsonPropertyName("class")]
+        public string Class { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
-            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string classProperty = default;
             int name = default;
+            string _class = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "class":
-                            classProperty = reader.GetString();
-                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
+                        case "class":
+                            _class = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(classProperty, name);
+            return new Model200Response(name, _class);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
+            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
index dc243ef72f6..bb6857ac351 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="clientProperty">clientProperty</param>
+        /// <param name="_client">_client</param>
         [JsonConstructor]
-        public ModelClient(string clientProperty)
+        public ModelClient(string _client)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (clientProperty == null)
-                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
+            if (_client == null)
+                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _ClientProperty = clientProperty;
+            _Client = _client;
         }
 
         /// <summary>
-        /// Gets or Sets _ClientProperty
+        /// Gets or Sets _Client
         /// </summary>
         [JsonPropertyName("client")]
-        public string _ClientProperty { get; set; }
+        public string _Client { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
+            sb.Append("  _Client: ").Append(_Client).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string clientProperty = default;
+            string _client = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            clientProperty = reader.GetString();
+                            _client = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(clientProperty);
+            return new ModelClient(_client);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._ClientProperty);
+            writer.WriteString("client", modelClient._Client);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
index 9b07795a3e5..f22e38dfc5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
@@ -32,17 +32,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="property">property</param>
         /// <param name="snakeCase">snakeCase</param>
+        /// <param name="property">property</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, string property, int snakeCase, int _123number)
+        public Name(int nameProperty, int snakeCase, string property, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (nameProperty == null)
-                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
+            if (name == null)
+                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            Property = property;
             SnakeCase = snakeCase;
+            Property = property;
             _123Number = _123number;
         }
 
@@ -68,18 +68,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Property
-        /// </summary>
-        [JsonPropertyName("property")]
-        public string Property { get; set; }
-
         /// <summary>
         /// Gets or Sets SnakeCase
         /// </summary>
         [JsonPropertyName("snake_case")]
         public int SnakeCase { get; }
 
+        /// <summary>
+        /// Gets or Sets Property
+        /// </summary>
+        [JsonPropertyName("property")]
+        public string Property { get; set; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -101,8 +101,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            sb.Append("  Property: ").Append(Property).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -179,8 +179,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            string property = default;
             int snakeCase = default;
+            string property = default;
             int _123number = default;
 
             while (reader.Read())
@@ -201,12 +201,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "property":
-                            property = reader.GetString();
-                            break;
                         case "snake_case":
                             snakeCase = reader.GetInt32();
                             break;
+                        case "property":
+                            property = reader.GetString();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -216,7 +216,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, property, snakeCase, _123number);
+            return new Name(nameProperty, snakeCase, property, _123number);
         }
 
         /// <summary>
@@ -231,8 +231,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteString("property", name.Property);
             writer.WriteNumber("snake_case", name.SnakeCase);
+            writer.WriteString("property", name.Property);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
index 5267e11d8b1..2ad9b9f2522 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="booleanProp">booleanProp</param>
+        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
-        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
         /// <param name="objectNullableProp">objectNullableProp</param>
-        /// <param name="stringProp">stringProp</param>
+        /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
         [JsonConstructor]
-        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectNullableProp = default, string stringProp = default) : base()
+        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object> arrayNullableProp = default, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object> objectNullableProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,43 +58,31 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectItemsNullable = objectItemsNullable;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayNullableProp = arrayNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             BooleanProp = booleanProp;
+            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
-            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayItemsNullable = arrayItemsNullable;
             ObjectNullableProp = objectNullableProp;
-            StringProp = stringProp;
+            ObjectAndItemsNullableProp = objectAndItemsNullableProp;
+            ObjectItemsNullable = objectItemsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
-        /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
-        /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object> ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object> ArrayNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
         /// Gets or Sets BooleanProp
@@ -102,6 +90,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("boolean_prop")]
         public bool? BooleanProp { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProp
+        /// </summary>
+        [JsonPropertyName("string_prop")]
+        public string StringProp { get; set; }
+
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
@@ -115,22 +109,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object> ArrayNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object> ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -139,10 +133,16 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string StringProp { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ObjectItemsNullable
+        /// </summary>
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -153,18 +153,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
-            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
             sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
+            sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -201,18 +201,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectItemsNullable = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             bool? booleanProp = default;
+            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            int? integerProp = default;
-            decimal? numberProp = default;
-            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayItemsNullable = default;
             Dictionary<string, Object> objectNullableProp = default;
-            string stringProp = default;
+            Dictionary<string, Object> objectAndItemsNullableProp = default;
+            Dictionary<string, Object> objectItemsNullable = default;
 
             while (reader.Read())
             {
@@ -229,43 +229,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
+                        case "string_prop":
+                            stringProp = reader.GetString();
+                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -273,7 +273,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
+            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
         }
 
         /// <summary>
@@ -287,22 +287,6 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            if (nullableClass.BooleanProp != null)
-                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
-            else
-                writer.WriteNull("boolean_prop");
-            writer.WritePropertyName("date_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
-            writer.WritePropertyName("datetime_prop");
-            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
             if (nullableClass.IntegerProp != null)
                 writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
             else
@@ -311,11 +295,27 @@ namespace Org.OpenAPITools.Model
                 writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
             else
                 writer.WriteNull("number_prop");
-            writer.WritePropertyName("object_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            if (nullableClass.BooleanProp != null)
+                writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
+            else
+                writer.WriteNull("boolean_prop");
+            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("date_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
+            writer.WritePropertyName("datetime_prop");
+            JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
             writer.WritePropertyName("object_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
-            writer.WriteString("string_prop", nullableClass.StringProp);
+            writer.WritePropertyName("object_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index 225a89ebe9a..5799fd94e53 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="bars">bars</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
-        /// <param name="id">id</param>
         /// <param name="uuid">uuid</param>
+        /// <param name="id">id</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="bars">bars</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
+        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,18 +56,24 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Bars = bars;
-            DeprecatedRef = deprecatedRef;
-            Id = id;
             Uuid = uuid;
+            Id = id;
+            DeprecatedRef = deprecatedRef;
+            Bars = bars;
         }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Uuid
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -77,17 +83,11 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -103,10 +103,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Bars: ").Append(Bars).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Bars: ").Append(Bars).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -144,10 +144,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> bars = default;
-            DeprecatedObject deprecatedRef = default;
-            decimal id = default;
             string uuid = default;
+            decimal id = default;
+            DeprecatedObject deprecatedRef = default;
+            List<string> bars = default;
 
             while (reader.Read())
             {
@@ -164,17 +164,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
-                        case "deprecatedRef":
-                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         case "id":
                             id = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetString();
+                        case "deprecatedRef":
+                            deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
+                            break;
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         default:
                             break;
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
+            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
         }
 
         /// <summary>
@@ -196,12 +196,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("bars");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
             writer.WritePropertyName("deprecatedRef");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
+            writer.WritePropertyName("bars");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
index 67d1551e614..bedf2f03a7f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
-        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
+        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
+        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
+            MyBoolean = myBoolean;
         }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
+            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myBoolean, myNumber, myString);
+            return new OuterComposite(myNumber, myString, myBoolean);
         }
 
         /// <summary>
@@ -177,9 +177,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
index 623ba045e38..0d090017be7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
-        /// <param name="category">category</param>
-        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="status">pet status in the store</param>
+        /// <param name="id">id</param>
+        /// <param name="category">category</param>
         /// <param name="tags">tags</param>
+        /// <param name="status">pet status in the store</param>
         [JsonConstructor]
-        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
+        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,12 +64,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Category = category;
-            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Status = status;
+            Id = id;
+            Category = category;
             Tags = tags;
+            Status = status;
         }
 
         /// <summary>
@@ -141,18 +141,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("status")]
         public StatusEnum Status { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Category
-        /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
@@ -165,6 +153,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("photoUrls")]
         public List<string> PhotoUrls { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Category
+        /// </summary>
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
+
         /// <summary>
         /// Gets or Sets Tags
         /// </summary>
@@ -185,12 +185,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
             sb.Append("  Tags: ").Append(Tags).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Category category = default;
-            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            Pet.StatusEnum status = default;
+            long id = default;
+            Category category = default;
             List<Tag> tags = default;
+            Pet.StatusEnum status = default;
 
             while (reader.Read())
             {
@@ -250,32 +250,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
-                            break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "name":
                             name = reader.GetString();
                             break;
                         case "photoUrls":
                             photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
-                        case "status":
-                            string statusRawValue = reader.GetString();
-                            status = Pet.StatusEnumFromString(statusRawValue);
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "tags":
                             tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
                             break;
+                        case "status":
+                            string statusRawValue = reader.GetString();
+                            status = Pet.StatusEnumFromString(statusRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(category, id, name, photoUrls, status, tags);
+            return new Pet(name, photoUrls, id, category, tags, status);
         }
 
         /// <summary>
@@ -289,19 +289,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
+            writer.WriteNumber("id", pet.Id);
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
index 3ddbc0ada7a..fc6815b4f91 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
@@ -38,8 +38,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (returnProperty == null)
-                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
+            if (_return == null)
+                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
index 92b7dee149e..c9d60d18139 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         /// <param name="specialPropertyName">specialPropertyName</param>
+        /// <param name="specialModelNameProperty">specialModelNameProperty</param>
         [JsonConstructor]
-        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
+        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelNameProperty == null)
-                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
+            if (specialModelName == null)
+                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialModelNameProperty = specialModelNameProperty;
             SpecialPropertyName = specialPropertyName;
+            SpecialModelNameProperty = specialModelNameProperty;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialModelNameProperty
-        /// </summary>
-        [JsonPropertyName("_special_model.name_")]
-        public string SpecialModelNameProperty { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialPropertyName
         /// </summary>
         [JsonPropertyName("$special[property.name]")]
         public long SpecialPropertyName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialModelNameProperty
+        /// </summary>
+        [JsonPropertyName("_special_model.name_")]
+        public string SpecialModelNameProperty { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
+            sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string specialModelNameProperty = default;
             long specialPropertyName = default;
+            string specialModelNameProperty = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "_special_model.name_":
-                            specialModelNameProperty = reader.GetString();
-                            break;
                         case "$special[property.name]":
                             specialPropertyName = reader.GetInt64();
                             break;
+                        case "_special_model.name_":
+                            specialModelNameProperty = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
+            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
             writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
+            writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
index c1b37bf1aa4..c59706d5d0c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="email">email</param>
-        /// <param name="firstName">firstName</param>
         /// <param name="id">id</param>
+        /// <param name="username">username</param>
+        /// <param name="firstName">firstName</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="email">email</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="username">username</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default)
+        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object objectWithNoDeclaredPropsNullable = default, Object anyTypeProp = default, Object anyTypePropNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -79,37 +79,37 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Email = email;
-            FirstName = firstName;
             Id = id;
+            Username = username;
+            FirstName = firstName;
             LastName = lastName;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            Email = email;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            Username = username;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets FirstName
+        /// Gets or Sets Username
         /// </summary>
-        [JsonPropertyName("firstName")]
-        public string FirstName { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets FirstName
         /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
+        [JsonPropertyName("firstName")]
+        public string FirstName { get; set; }
 
         /// <summary>
         /// Gets or Sets LastName
@@ -118,11 +118,10 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
+        /// Gets or Sets Email
         /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -144,10 +143,18 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// Gets or Sets Username
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
+
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -163,13 +170,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object AnyTypePropNullable { get; set; }
 
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -184,18 +184,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -233,18 +233,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string email = default;
-            string firstName = default;
             long id = default;
+            string username = default;
+            string firstName = default;
             string lastName = default;
-            Object objectWithNoDeclaredProps = default;
+            string email = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            string username = default;
+            Object objectWithNoDeclaredProps = default;
+            Object objectWithNoDeclaredPropsNullable = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
-            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -261,20 +261,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "email":
-                            email = reader.GetString();
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "password":
                             password = reader.GetString();
@@ -285,8 +285,11 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "username":
-                            username = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -294,16 +297,13 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
+            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
         }
 
         /// <summary>
@@ -317,22 +317,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("email", user.Email);
-            writer.WriteString("firstName", user.FirstName);
             writer.WriteNumber("id", user.Id);
+            writer.WriteString("username", user.Username);
+            writer.WriteString("firstName", user.FirstName);
             writer.WriteString("lastName", user.LastName);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WriteString("email", user.Email);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WriteString("username", user.Username);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go
index d3bf38961f6..6981af581d9 100644
--- a/samples/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_fake.go
@@ -1073,7 +1073,7 @@ type ApiTestEndpointParametersRequest struct {
 	int64_ *int64
 	float *float32
 	string_ *string
-	binary *os.File
+	binary **os.File
 	date *string
 	dateTime *time.Time
 	password *string
@@ -1135,7 +1135,7 @@ func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpoin
 }
 
 // None
-func (r ApiTestEndpointParametersRequest) Binary(binary os.File) ApiTestEndpointParametersRequest {
+func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest {
 	r.binary = &binary
 	return r
 }
@@ -1271,7 +1271,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 
 	binaryLocalVarFormFileName = "binary"
 
-	var binaryLocalVarFile *os.File
+	var binaryLocalVarFile **os.File
 	if r.binary != nil {
 		binaryLocalVarFile = r.binary
 	}
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index 57f4495a1e4..b3fed80ec4e 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -895,7 +895,7 @@ type ApiUploadFileRequest struct {
 	ApiService PetApi
 	petId int64
 	additionalMetadata *string
-	file *os.File
+	file **os.File
 }
 
 // Additional data to pass to server
@@ -905,7 +905,7 @@ func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiU
 }
 
 // file to upload
-func (r ApiUploadFileRequest) File(file os.File) ApiUploadFileRequest {
+func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
 	r.file = &file
 	return r
 }
@@ -977,7 +977,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 
 	fileLocalVarFormFileName = "file"
 
-	var fileLocalVarFile *os.File
+	var fileLocalVarFile **os.File
 	if r.file != nil {
 		fileLocalVarFile = r.file
 	}
@@ -1029,12 +1029,12 @@ type ApiUploadFileWithRequiredFileRequest struct {
 	ctx context.Context
 	ApiService PetApi
 	petId int64
-	requiredFile *os.File
+	requiredFile **os.File
 	additionalMetadata *string
 }
 
 // file to upload
-func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile os.File) ApiUploadFileWithRequiredFileRequest {
+func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest {
 	r.requiredFile = &requiredFile
 	return r
 }
diff --git a/samples/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
index 8c4af68e455..e51cddca5bd 100644
--- a/samples/client/petstore/go/go-petstore/docs/FakeApi.md
+++ b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
@@ -574,7 +574,7 @@ func main() {
     int64_ := int64(789) // int64 | None (optional)
     float := float32(3.4) // float32 | None (optional)
     string_ := "string__example" // string | None (optional)
-    binary := os.NewFile(1234, "some_file") // os.File | None (optional)
+    binary := os.NewFile(1234, "some_file") // *os.File | None (optional)
     date := time.Now() // string | None (optional)
     dateTime := time.Now() // time.Time | None (optional)
     password := "password_example" // string | None (optional)
@@ -610,7 +610,7 @@ Name | Type | Description  | Notes
  **int64_** | **int64** | None | 
  **float** | **float32** | None | 
  **string_** | **string** | None | 
- **binary** | **os.File** | None | 
+ **binary** | ***os.File** | None | 
  **date** | **string** | None | 
  **dateTime** | **time.Time** | None | 
  **password** | **string** | None | 
diff --git a/samples/client/petstore/go/go-petstore/docs/FormatTest.md b/samples/client/petstore/go/go-petstore/docs/FormatTest.md
index 2c486b4b6b0..e726c1ee939 100644
--- a/samples/client/petstore/go/go-petstore/docs/FormatTest.md
+++ b/samples/client/petstore/go/go-petstore/docs/FormatTest.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
 **Byte** | **string** |  | 
-**Binary** | Pointer to **os.File** |  | [optional] 
+**Binary** | Pointer to ***os.File** |  | [optional] 
 **Date** | **string** |  | 
 **DateTime** | Pointer to **time.Time** |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
@@ -230,20 +230,20 @@ SetByte sets Byte field to given value.
 
 ### GetBinary
 
-`func (o *FormatTest) GetBinary() os.File`
+`func (o *FormatTest) GetBinary() *os.File`
 
 GetBinary returns the Binary field if non-nil, zero value otherwise.
 
 ### GetBinaryOk
 
-`func (o *FormatTest) GetBinaryOk() (*os.File, bool)`
+`func (o *FormatTest) GetBinaryOk() (**os.File, bool)`
 
 GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetBinary
 
-`func (o *FormatTest) SetBinary(v os.File)`
+`func (o *FormatTest) SetBinary(v *os.File)`
 
 SetBinary sets Binary field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/PetApi.md b/samples/client/petstore/go/go-petstore/docs/PetApi.md
index 519c51b2444..81c7e187ac7 100644
--- a/samples/client/petstore/go/go-petstore/docs/PetApi.md
+++ b/samples/client/petstore/go/go-petstore/docs/PetApi.md
@@ -501,7 +501,7 @@ import (
 func main() {
     petId := int64(789) // int64 | ID of pet to update
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
-    file := os.NewFile(1234, "some_file") // os.File | file to upload (optional)
+    file := os.NewFile(1234, "some_file") // *os.File | file to upload (optional)
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -532,7 +532,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
  **additionalMetadata** | **string** | Additional data to pass to server | 
- **file** | **os.File** | file to upload | 
+ **file** | ***os.File** | file to upload | 
 
 ### Return type
 
@@ -572,7 +572,7 @@ import (
 
 func main() {
     petId := int64(789) // int64 | ID of pet to update
-    requiredFile := os.NewFile(1234, "some_file") // os.File | file to upload
+    requiredFile := os.NewFile(1234, "some_file") // *os.File | file to upload
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
 
     configuration := openapiclient.NewConfiguration()
@@ -603,7 +603,7 @@ Other parameters are passed through a pointer to a apiUploadFileWithRequiredFile
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **requiredFile** | **os.File** | file to upload | 
+ **requiredFile** | ***os.File** | file to upload | 
  **additionalMetadata** | **string** | Additional data to pass to server | 
 
 ### Return type
diff --git a/samples/client/petstore/go/go-petstore/model_format_test_.go b/samples/client/petstore/go/go-petstore/model_format_test_.go
index 48acbc14414..0cfe962744c 100644
--- a/samples/client/petstore/go/go-petstore/model_format_test_.go
+++ b/samples/client/petstore/go/go-petstore/model_format_test_.go
@@ -29,7 +29,7 @@ type FormatTest struct {
 	Double *float64 `json:"double,omitempty"`
 	String *string `json:"string,omitempty"`
 	Byte string `json:"byte"`
-	Binary *os.File `json:"binary,omitempty"`
+	Binary **os.File `json:"binary,omitempty"`
 	Date string `json:"date"`
 	DateTime *time.Time `json:"dateTime,omitempty"`
 	Uuid *string `json:"uuid,omitempty"`
@@ -299,9 +299,9 @@ func (o *FormatTest) SetByte(v string) {
 }
 
 // GetBinary returns the Binary field value if set, zero value otherwise.
-func (o *FormatTest) GetBinary() os.File {
+func (o *FormatTest) GetBinary() *os.File {
 	if o == nil || isNil(o.Binary) {
-		var ret os.File
+		var ret *os.File
 		return ret
 	}
 	return *o.Binary
@@ -309,7 +309,7 @@ func (o *FormatTest) GetBinary() os.File {
 
 // GetBinaryOk returns a tuple with the Binary field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *FormatTest) GetBinaryOk() (*os.File, bool) {
+func (o *FormatTest) GetBinaryOk() (**os.File, bool) {
 	if o == nil || isNil(o.Binary) {
 		return nil, false
 	}
@@ -325,8 +325,8 @@ func (o *FormatTest) HasBinary() bool {
 	return false
 }
 
-// SetBinary gets a reference to the given os.File and assigns it to the Binary field.
-func (o *FormatTest) SetBinary(v os.File) {
+// SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
+func (o *FormatTest) SetBinary(v *os.File) {
 	o.Binary = &v
 }
 
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
index 3b789c81367..7e5025e58ce 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_string** | **dict[str, str]** |  | [optional] 
-**map_number** | **dict[str, float]** |  | [optional] 
-**map_integer** | **dict[str, int]** |  | [optional] 
-**map_boolean** | **dict[str, bool]** |  | [optional] 
-**map_array_integer** | **dict[str, list[int]]** |  | [optional] 
-**map_array_anytype** | **dict[str, list[object]]** |  | [optional] 
-**map_map_string** | **dict[str, dict[str, str]]** |  | [optional] 
-**map_map_anytype** | **dict[str, dict[str, object]]** |  | [optional] 
+**map_string** | **dict(str, str)** |  | [optional] 
+**map_number** | **dict(str, float)** |  | [optional] 
+**map_integer** | **dict(str, int)** |  | [optional] 
+**map_boolean** | **dict(str, bool)** |  | [optional] 
+**map_array_integer** | **dict(str, list[int])** |  | [optional] 
+**map_array_anytype** | **dict(str, list[object])** |  | [optional] 
+**map_map_string** | **dict(str, dict(str, str))** |  | [optional] 
+**map_map_anytype** | **dict(str, dict(str, object))** |  | [optional] 
 **anytype_1** | **object** |  | [optional] 
 **anytype_2** | **object** |  | [optional] 
 **anytype_3** | **object** |  | [optional] 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
index b561f467d21..52c475c4460 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
@@ -36,14 +36,14 @@ class AdditionalPropertiesClass(object):
                             and the value is json key in definition.
     """
     openapi_types = {
-        'map_string': 'dict[str, str]',
-        'map_number': 'dict[str, float]',
-        'map_integer': 'dict[str, int]',
-        'map_boolean': 'dict[str, bool]',
-        'map_array_integer': 'dict[str, list[int]]',
-        'map_array_anytype': 'dict[str, list[object]]',
-        'map_map_string': 'dict[str, dict[str, str]]',
-        'map_map_anytype': 'dict[str, dict[str, object]]',
+        'map_string': 'dict(str, str)',
+        'map_number': 'dict(str, float)',
+        'map_integer': 'dict(str, int)',
+        'map_boolean': 'dict(str, bool)',
+        'map_array_integer': 'dict(str, list[int])',
+        'map_array_anytype': 'dict(str, list[object])',
+        'map_map_string': 'dict(str, dict(str, str))',
+        'map_map_anytype': 'dict(str, dict(str, object))',
         'anytype_1': 'object',
         'anytype_2': 'object',
         'anytype_3': 'object'
@@ -111,7 +111,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, str]
+        :rtype: dict(str, str)
         """
         return self._map_string
 
@@ -121,7 +121,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_string: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_string: dict[str, str]
+        :type map_string: dict(str, str)
         """
 
         self._map_string = map_string
@@ -132,7 +132,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, float]
+        :rtype: dict(str, float)
         """
         return self._map_number
 
@@ -142,7 +142,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_number: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_number: dict[str, float]
+        :type map_number: dict(str, float)
         """
 
         self._map_number = map_number
@@ -153,7 +153,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, int]
+        :rtype: dict(str, int)
         """
         return self._map_integer
 
@@ -163,7 +163,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_integer: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_integer: dict[str, int]
+        :type map_integer: dict(str, int)
         """
 
         self._map_integer = map_integer
@@ -174,7 +174,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, bool]
+        :rtype: dict(str, bool)
         """
         return self._map_boolean
 
@@ -184,7 +184,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_boolean: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_boolean: dict[str, bool]
+        :type map_boolean: dict(str, bool)
         """
 
         self._map_boolean = map_boolean
@@ -195,7 +195,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, list[int]]
+        :rtype: dict(str, list[int])
         """
         return self._map_array_integer
 
@@ -205,7 +205,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_integer: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_array_integer: dict[str, list[int]]
+        :type map_array_integer: dict(str, list[int])
         """
 
         self._map_array_integer = map_array_integer
@@ -216,7 +216,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, list[object]]
+        :rtype: dict(str, list[object])
         """
         return self._map_array_anytype
 
@@ -226,7 +226,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_anytype: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_array_anytype: dict[str, list[object]]
+        :type map_array_anytype: dict(str, list[object])
         """
 
         self._map_array_anytype = map_array_anytype
@@ -237,7 +237,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, dict[str, str]]
+        :rtype: dict(str, dict(str, str))
         """
         return self._map_map_string
 
@@ -247,7 +247,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_string: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_map_string: dict[str, dict[str, str]]
+        :type map_map_string: dict(str, dict(str, str))
         """
 
         self._map_map_string = map_map_string
@@ -258,7 +258,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, dict[str, object]]
+        :rtype: dict(str, dict(str, object))
         """
         return self._map_map_anytype
 
@@ -268,7 +268,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_anytype: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_map_anytype: dict[str, dict[str, object]]
+        :type map_map_anytype: dict(str, dict(str, object))
         """
 
         self._map_map_anytype = map_map_anytype
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
index 7237aeb0956..50e790d06d1 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1965,9 +1965,7 @@ components:
     NullableAllOf:
       properties:
         child:
-          allOf:
-          - $ref: '#/components/schemas/NullableAllOfChild'
-          nullable: true
+          $ref: '#/components/schemas/NullableAllOf_child'
       type: object
     OneOfPrimitiveType:
       oneOf:
@@ -2186,6 +2184,10 @@ components:
           type: boolean
       type: object
       example: null
+    NullableAllOf_child:
+      allOf:
+      - $ref: '#/components/schemas/NullableAllOfChild'
+      nullable: true
     DuplicatedPropChild_allOf:
       properties:
         dup-prop:
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
index 5a183d84881..0994d7aaef5 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
@@ -1099,7 +1099,7 @@ type ApiTestEndpointParametersRequest struct {
 	int64_ *int64
 	float *float32
 	string_ *string
-	binary *os.File
+	binary **os.File
 	date *string
 	dateTime *time.Time
 	password *string
@@ -1161,7 +1161,7 @@ func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpoin
 }
 
 // None
-func (r ApiTestEndpointParametersRequest) Binary(binary os.File) ApiTestEndpointParametersRequest {
+func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest {
 	r.binary = &binary
 	return r
 }
@@ -1298,7 +1298,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 
 	binaryLocalVarFormFileName = "binary"
 
-	var binaryLocalVarFile *os.File
+	var binaryLocalVarFile **os.File
 	if r.binary != nil {
 		binaryLocalVarFile = r.binary
 	}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
index 34f0b0be002..052f7b9a45a 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
@@ -916,7 +916,7 @@ type ApiUploadFileRequest struct {
 	ApiService PetApi
 	petId int64
 	additionalMetadata *string
-	file *os.File
+	file **os.File
 }
 
 // Additional data to pass to server
@@ -926,7 +926,7 @@ func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiU
 }
 
 // file to upload
-func (r ApiUploadFileRequest) File(file os.File) ApiUploadFileRequest {
+func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
 	r.file = &file
 	return r
 }
@@ -1000,7 +1000,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 
 	fileLocalVarFormFileName = "file"
 
-	var fileLocalVarFile *os.File
+	var fileLocalVarFile **os.File
 	if r.file != nil {
 		fileLocalVarFile = r.file
 	}
@@ -1052,12 +1052,12 @@ type ApiUploadFileWithRequiredFileRequest struct {
 	ctx context.Context
 	ApiService PetApi
 	petId int64
-	requiredFile *os.File
+	requiredFile **os.File
 	additionalMetadata *string
 }
 
 // file to upload
-func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile os.File) ApiUploadFileWithRequiredFileRequest {
+func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest {
 	r.requiredFile = &requiredFile
 	return r
 }
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
index 050416eabd8..7f9d080e73e 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
@@ -571,7 +571,7 @@ func main() {
     int64_ := int64(789) // int64 | None (optional)
     float := float32(3.4) // float32 | None (optional)
     string_ := "string__example" // string | None (optional)
-    binary := os.NewFile(1234, "some_file") // os.File | None (optional)
+    binary := os.NewFile(1234, "some_file") // *os.File | None (optional)
     date := time.Now() // string | None (optional)
     dateTime := time.Now() // time.Time | None (optional)
     password := "password_example" // string | None (optional)
@@ -607,7 +607,7 @@ Name | Type | Description  | Notes
  **int64_** | **int64** | None | 
  **float** | **float32** | None | 
  **string_** | **string** | None | 
- **binary** | **os.File** | None | 
+ **binary** | ***os.File** | None | 
  **date** | **string** | None | 
  **dateTime** | **time.Time** | None | 
  **password** | **string** | None | 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
index 392cf79236a..2e2ed889929 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
 **Byte** | **string** |  | 
-**Binary** | Pointer to **os.File** |  | [optional] 
+**Binary** | Pointer to ***os.File** |  | [optional] 
 **Date** | **string** |  | 
 **DateTime** | Pointer to **time.Time** |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
@@ -231,20 +231,20 @@ SetByte sets Byte field to given value.
 
 ### GetBinary
 
-`func (o *FormatTest) GetBinary() os.File`
+`func (o *FormatTest) GetBinary() *os.File`
 
 GetBinary returns the Binary field if non-nil, zero value otherwise.
 
 ### GetBinaryOk
 
-`func (o *FormatTest) GetBinaryOk() (*os.File, bool)`
+`func (o *FormatTest) GetBinaryOk() (**os.File, bool)`
 
 GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetBinary
 
-`func (o *FormatTest) SetBinary(v os.File)`
+`func (o *FormatTest) SetBinary(v *os.File)`
 
 SetBinary sets Binary field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
index 6514a699f0f..245df44f8db 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**PropTest** | Pointer to **map[string]os.File** | a property to test map of file | [optional] 
+**PropTest** | Pointer to **map[string]*os.File** | a property to test map of file | [optional] 
 
 ## Methods
 
@@ -27,20 +27,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetPropTest
 
-`func (o *MapOfFileTest) GetPropTest() map[string]os.File`
+`func (o *MapOfFileTest) GetPropTest() map[string]*os.File`
 
 GetPropTest returns the PropTest field if non-nil, zero value otherwise.
 
 ### GetPropTestOk
 
-`func (o *MapOfFileTest) GetPropTestOk() (*map[string]os.File, bool)`
+`func (o *MapOfFileTest) GetPropTestOk() (*map[string]*os.File, bool)`
 
 GetPropTestOk returns a tuple with the PropTest field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetPropTest
 
-`func (o *MapOfFileTest) SetPropTest(v map[string]os.File)`
+`func (o *MapOfFileTest) SetPropTest(v map[string]*os.File)`
 
 SetPropTest sets PropTest field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
index 7bf269f8930..24b558097a7 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
@@ -511,7 +511,7 @@ import (
 func main() {
     petId := int64(789) // int64 | ID of pet to update
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
-    file := os.NewFile(1234, "some_file") // os.File | file to upload (optional)
+    file := os.NewFile(1234, "some_file") // *os.File | file to upload (optional)
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -542,7 +542,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
  **additionalMetadata** | **string** | Additional data to pass to server | 
- **file** | **os.File** | file to upload | 
+ **file** | ***os.File** | file to upload | 
 
 ### Return type
 
@@ -584,7 +584,7 @@ import (
 
 func main() {
     petId := int64(789) // int64 | ID of pet to update
-    requiredFile := os.NewFile(1234, "some_file") // os.File | file to upload
+    requiredFile := os.NewFile(1234, "some_file") // *os.File | file to upload
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
 
     configuration := openapiclient.NewConfiguration()
@@ -615,7 +615,7 @@ Other parameters are passed through a pointer to a apiUploadFileWithRequiredFile
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **requiredFile** | **os.File** | file to upload | 
+ **requiredFile** | ***os.File** | file to upload | 
  **additionalMetadata** | **string** | Additional data to pass to server | 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
index 0086958677d..fe95d07ffaf 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
@@ -29,7 +29,7 @@ type FormatTest struct {
 	Double *float64 `json:"double,omitempty"`
 	String *string `json:"string,omitempty"`
 	Byte string `json:"byte"`
-	Binary *os.File `json:"binary,omitempty"`
+	Binary **os.File `json:"binary,omitempty"`
 	Date string `json:"date"`
 	DateTime *time.Time `json:"dateTime,omitempty"`
 	Uuid *string `json:"uuid,omitempty"`
@@ -305,9 +305,9 @@ func (o *FormatTest) SetByte(v string) {
 }
 
 // GetBinary returns the Binary field value if set, zero value otherwise.
-func (o *FormatTest) GetBinary() os.File {
+func (o *FormatTest) GetBinary() *os.File {
 	if o == nil || isNil(o.Binary) {
-		var ret os.File
+		var ret *os.File
 		return ret
 	}
 	return *o.Binary
@@ -315,7 +315,7 @@ func (o *FormatTest) GetBinary() os.File {
 
 // GetBinaryOk returns a tuple with the Binary field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *FormatTest) GetBinaryOk() (*os.File, bool) {
+func (o *FormatTest) GetBinaryOk() (**os.File, bool) {
 	if o == nil || isNil(o.Binary) {
 		return nil, false
 	}
@@ -331,8 +331,8 @@ func (o *FormatTest) HasBinary() bool {
 	return false
 }
 
-// SetBinary gets a reference to the given os.File and assigns it to the Binary field.
-func (o *FormatTest) SetBinary(v os.File) {
+// SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
+func (o *FormatTest) SetBinary(v *os.File) {
 	o.Binary = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
index f696a624be3..a96502e0847 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &MapOfFileTest{}
 // MapOfFileTest test map of file in a property
 type MapOfFileTest struct {
 	// a property to test map of file
-	PropTest *map[string]os.File `json:"prop_test,omitempty"`
+	PropTest *map[string]*os.File `json:"prop_test,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
 
@@ -45,9 +45,9 @@ func NewMapOfFileTestWithDefaults() *MapOfFileTest {
 }
 
 // GetPropTest returns the PropTest field value if set, zero value otherwise.
-func (o *MapOfFileTest) GetPropTest() map[string]os.File {
+func (o *MapOfFileTest) GetPropTest() map[string]*os.File {
 	if o == nil || isNil(o.PropTest) {
-		var ret map[string]os.File
+		var ret map[string]*os.File
 		return ret
 	}
 	return *o.PropTest
@@ -55,7 +55,7 @@ func (o *MapOfFileTest) GetPropTest() map[string]os.File {
 
 // GetPropTestOk returns a tuple with the PropTest field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MapOfFileTest) GetPropTestOk() (*map[string]os.File, bool) {
+func (o *MapOfFileTest) GetPropTestOk() (*map[string]*os.File, bool) {
 	if o == nil || isNil(o.PropTest) {
 		return nil, false
 	}
@@ -71,8 +71,8 @@ func (o *MapOfFileTest) HasPropTest() bool {
 	return false
 }
 
-// SetPropTest gets a reference to the given map[string]os.File and assigns it to the PropTest field.
-func (o *MapOfFileTest) SetPropTest(v map[string]os.File) {
+// SetPropTest gets a reference to the given map[string]*os.File and assigns it to the PropTest field.
+func (o *MapOfFileTest) SetPropTest(v map[string]*os.File) {
 	o.PropTest = &v
 }
 
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
index d08ea901b62..44eba731566 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
@@ -4,8 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_property** | **dict[str, str]** |  | [optional] 
-**map_of_map_property** | **dict[str, dict[str, str]]** |  | [optional] 
+**map_property** | **dict(str, str)** |  | [optional] 
+**map_of_map_property** | **dict(str, dict(str, str))** |  | [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/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
index 710807587e2..f8303e680b2 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
@@ -36,8 +36,8 @@ class AdditionalPropertiesClass(object):
                             and the value is json key in definition.
     """
     openapi_types = {
-        'map_property': 'dict[str, str]',
-        'map_of_map_property': 'dict[str, dict[str, str]]'
+        'map_property': 'dict(str, str)',
+        'map_of_map_property': 'dict(str, dict(str, str))'
     }
 
     attribute_map = {
@@ -66,7 +66,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, str]
+        :rtype: dict(str, str)
         """
         return self._map_property
 
@@ -76,7 +76,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_property: The map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_property: dict[str, str]
+        :type map_property: dict(str, str)
         """
 
         self._map_property = map_property
@@ -87,7 +87,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_of_map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict[str, dict[str, str]]
+        :rtype: dict(str, dict(str, str))
         """
         return self._map_of_map_property
 
@@ -97,7 +97,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_of_map_property: The map_of_map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_of_map_property: dict[str, dict[str, str]]
+        :type map_of_map_property: dict(str, dict(str, str))
         """
 
         self._map_of_map_property = map_of_map_property
diff --git a/samples/server/petstore/go-api-server/go/api.go b/samples/server/petstore/go-api-server/go/api.go
index cac28b4f04a..bedb0f7985e 100644
--- a/samples/server/petstore/go-api-server/go/api.go
+++ b/samples/server/petstore/go-api-server/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-api-server/go/api_pet_service.go b/samples/server/petstore/go-api-server/go/api_pet_service.go
index 7a77914cafd..9a390ecef3d 100644
--- a/samples/server/petstore/go-api-server/go/api_pet_service.go
+++ b/samples/server/petstore/go-api-server/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
diff --git a/samples/server/petstore/go-chi-server/go/api.go b/samples/server/petstore/go-chi-server/go/api.go
index cac28b4f04a..bedb0f7985e 100644
--- a/samples/server/petstore/go-chi-server/go/api.go
+++ b/samples/server/petstore/go-chi-server/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-chi-server/go/api_pet_service.go b/samples/server/petstore/go-chi-server/go/api_pet_service.go
index 7a77914cafd..9a390ecef3d 100644
--- a/samples/server/petstore/go-chi-server/go/api_pet_service.go
+++ b/samples/server/petstore/go-chi-server/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
diff --git a/samples/server/petstore/go-server-required/go/api.go b/samples/server/petstore/go-server-required/go/api.go
index cac28b4f04a..bedb0f7985e 100644
--- a/samples/server/petstore/go-server-required/go/api.go
+++ b/samples/server/petstore/go-server-required/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-server-required/go/api_pet_service.go b/samples/server/petstore/go-server-required/go/api_pet_service.go
index 7a77914cafd..9a390ecef3d 100644
--- a/samples/server/petstore/go-server-required/go/api_pet_service.go
+++ b/samples/server/petstore/go-server-required/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
-- 
GitLab


From 33d7e0b8e1a030d7119abb97f6daa554679284eb Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Fri, 30 Dec 2022 10:11:43 -0700
Subject: [PATCH 7/9] Update examples

---
 .../java/feign-gson/.openapi-generator/FILES  |   4 -
 .../client/echo_api/java/feign-gson/pom.xml   |  26 +-
 .../org/openapitools/client/ApiClient.java    |  40 +-
 .../openapitools/client/model/Category.java   |  31 +-
 .../org/openapitools/client/model/Pet.java    |  79 +--
 .../org/openapitools/client/model/Tag.java    |  31 +-
 ...deTrueArrayStringQueryObjectParameter.java |  24 +-
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 278 +-------
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  27 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 595 ++++++++++--------
 .../Api/FakeClassnameTags123Api.cs            |  27 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 322 ++++++----
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  81 ++-
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 229 ++++---
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 278 +-------
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  19 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 497 +++++++++------
 .../Api/FakeClassnameTags123Api.cs            |  19 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 258 +++++---
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  57 +-
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 175 ++++--
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../.openapi-generator/FILES                  |  12 +-
 .../README.md                                 | 266 +-------
 .../docs/apis/FakeApi.md                      |  60 +-
 .../docs/apis/PetApi.md                       |  20 +-
 .../docs/apis/UserApi.md                      |  10 +-
 .../docs/models/AdditionalPropertiesClass.md  |   6 +-
 .../docs/models/ApiResponse.md                |   2 +-
 .../docs/models/ArrayTest.md                  |   2 +-
 .../docs/models/Capitalization.md             |   6 +-
 .../docs/models/Category.md                   |   2 +-
 .../docs/models/ClassModel.md                 |   2 +-
 .../docs/models/Drawing.md                    |   2 +-
 .../docs/models/EnumArrays.md                 |   2 +-
 .../docs/models/EnumTest.md                   |   8 +-
 .../docs/models/FooGetDefaultResponse.md      |   2 +-
 .../docs/models/FormatTest.md                 |  22 +-
 .../docs/models/MapTest.md                    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../docs/models/Model200Response.md           |   2 +-
 .../docs/models/ModelClient.md                |   2 +-
 .../docs/models/Name.md                       |   2 +-
 .../docs/models/NullableClass.md              |  16 +-
 .../docs/models/ObjectWithDeprecatedFields.md |   6 +-
 .../docs/models/OuterComposite.md             |   2 +-
 .../docs/models/Pet.md                        |   6 +-
 .../docs/models/SpecialModelName.md           |   2 +-
 .../docs/models/User.md                       |  10 +-
 .../Org.OpenAPITools/Api/AnotherFakeApi.cs    |  19 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       | 497 +++++++++------
 .../Api/FakeClassnameTags123Api.cs            |  19 +-
 .../src/Org.OpenAPITools/Api/PetApi.cs        | 258 +++++---
 .../src/Org.OpenAPITools/Api/StoreApi.cs      |  57 +-
 .../src/Org.OpenAPITools/Api/UserApi.cs       | 175 ++++--
 .../Model/AdditionalPropertiesClass.cs        |  80 +--
 .../src/Org.OpenAPITools/Model/ApiResponse.cs |  32 +-
 .../src/Org.OpenAPITools/Model/ArrayTest.cs   |  34 +-
 .../Org.OpenAPITools/Model/Capitalization.cs  |  74 +--
 .../src/Org.OpenAPITools/Model/Category.cs    |  32 +-
 .../src/Org.OpenAPITools/Model/ClassModel.cs  |  24 +-
 .../src/Org.OpenAPITools/Model/Drawing.cs     |  34 +-
 .../src/Org.OpenAPITools/Model/EnumArrays.cs  | 106 ++--
 .../src/Org.OpenAPITools/Model/EnumTest.cs    | 374 +++++------
 .../Model/FooGetDefaultResponse.cs            |  24 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  | 356 +++++------
 .../src/Org.OpenAPITools/Model/MapTest.cs     |  64 +-
 ...dPropertiesAndAdditionalPropertiesClass.cs |  32 +-
 .../Model/Model200Response.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/ModelClient.cs |  24 +-
 .../src/Org.OpenAPITools/Model/Name.cs        |  36 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   | 206 +++---
 .../Model/ObjectWithDeprecatedFields.cs       |  74 +--
 .../Org.OpenAPITools/Model/OuterComposite.cs  |  32 +-
 .../src/Org.OpenAPITools/Model/Pet.cs         |  80 +--
 .../src/Org.OpenAPITools/Model/Return.cs      |   4 +-
 .../Model/SpecialModelName.cs                 |  36 +-
 .../src/Org.OpenAPITools/Model/User.cs        | 128 ++--
 .../petstore/go/go-petstore/api_fake.go       |   6 +-
 .../client/petstore/go/go-petstore/api_pet.go |  10 +-
 .../petstore/go/go-petstore/docs/FakeApi.md   |   4 +-
 .../go/go-petstore/docs/FormatTest.md         |   8 +-
 .../petstore/go/go-petstore/docs/PetApi.md    |   8 +-
 .../go/go-petstore/model_format_test_.go      |  12 +-
 .../docs/AdditionalPropertiesClass.md         |  16 +-
 .../models/additional_properties_class.py     |  48 +-
 .../petstore/go/go-petstore/api/openapi.yaml  |   8 +-
 .../petstore/go/go-petstore/api_fake.go       |   6 +-
 .../client/petstore/go/go-petstore/api_pet.go |  10 +-
 .../petstore/go/go-petstore/docs/FakeApi.md   |   4 +-
 .../go/go-petstore/docs/FormatTest.md         |   8 +-
 .../go/go-petstore/docs/MapOfFileTest.md      |   8 +-
 .../petstore/go/go-petstore/docs/PetApi.md    |   8 +-
 .../go/go-petstore/model_format_test_.go      |  12 +-
 .../go/go-petstore/model_map_of_file_test_.go |  12 +-
 .../docs/AdditionalPropertiesClass.md         |   4 +-
 .../models/additional_properties_class.py     |  12 +-
 .../server/petstore/go-api-server/go/api.go   |   2 +-
 .../go-api-server/go/api_pet_service.go       |   2 +-
 .../server/petstore/go-chi-server/go/api.go   |   2 +-
 .../go-chi-server/go/api_pet_service.go       |   2 +-
 .../petstore/go-server-required/go/api.go     |   2 +-
 .../go-server-required/go/api_pet_service.go  |   2 +-
 200 files changed, 5513 insertions(+), 5493 deletions(-)

diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
index 08189647cf6..bc1d247b05c 100644
--- a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
+++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES
@@ -15,10 +15,7 @@ pom.xml
 settings.gradle
 src/main/AndroidManifest.xml
 src/main/java/org/openapitools/client/ApiClient.java
-src/main/java/org/openapitools/client/ApiResponseDecoder.java
 src/main/java/org/openapitools/client/EncodingUtils.java
-src/main/java/org/openapitools/client/ParamExpander.java
-src/main/java/org/openapitools/client/RFC3339DateFormat.java
 src/main/java/org/openapitools/client/ServerConfiguration.java
 src/main/java/org/openapitools/client/ServerVariable.java
 src/main/java/org/openapitools/client/StringUtil.java
@@ -26,7 +23,6 @@ src/main/java/org/openapitools/client/api/BodyApi.java
 src/main/java/org/openapitools/client/api/PathApi.java
 src/main/java/org/openapitools/client/api/QueryApi.java
 src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
-src/main/java/org/openapitools/client/auth/DefaultApi20Impl.java
 src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
 src/main/java/org/openapitools/client/model/ApiResponse.java
diff --git a/samples/client/echo_api/java/feign-gson/pom.xml b/samples/client/echo_api/java/feign-gson/pom.xml
index 8f0977e98a6..4a36787dd00 100644
--- a/samples/client/echo_api/java/feign-gson/pom.xml
+++ b/samples/client/echo_api/java/feign-gson/pom.xml
@@ -222,7 +222,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-jackson</artifactId>
+            <artifactId>feign-gson</artifactId>
             <version>${feign-version}</version>
         </dependency>
         <dependency>
@@ -241,32 +241,16 @@
             <version>${feign-version}</version>
         </dependency>
 
-        <!-- JSON processing: jackson -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind-version}</version>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
         </dependency>
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
             <version>${jackson-databind-nullable-version}</version>
         </dependency>
-        <dependency>
-          <groupId>com.fasterxml.jackson.datatype</groupId>
-          <artifactId>jackson-datatype-jsr310</artifactId>
-          <version>${jackson-version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.scribejava</groupId>
             <artifactId>scribejava-core</artifactId>
@@ -325,7 +309,7 @@
         <swagger-annotations-version>1.6.6</swagger-annotations-version>
         <feign-version>10.11</feign-version>
         <feign-form-version>3.8.0</feign-form-version>
-        <jackson-version>2.13.4</jackson-version>
+        <gson-version>2.8.6</gson-version>
         <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
         <jackson-databind-version>2.13.4.2</jackson-databind-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
index eabf2563dd6..b122f0e05eb 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -5,23 +5,16 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import feign.okhttp.OkHttpClient;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import feign.Feign;
 import feign.RequestInterceptor;
 import feign.form.FormEncoder;
-import feign.jackson.JacksonDecoder;
-import feign.jackson.JacksonEncoder;
+import feign.gson.GsonDecoder;
+import feign.gson.GsonEncoder;
 import feign.slf4j.Slf4jLogger;
 import org.openapitools.client.auth.HttpBasicAuth;
 import org.openapitools.client.auth.HttpBearerAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
-import org.openapitools.client.ApiResponseDecoder;
 
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@@ -30,19 +23,16 @@ public class ApiClient {
 
   public interface Api {}
 
-  protected ObjectMapper objectMapper;
   private String basePath = "http://localhost:3000";
   private Map<String, RequestInterceptor> apiAuthorizations;
   private Feign.Builder feignBuilder;
 
   public ApiClient() {
     apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
-    objectMapper = createObjectMapper();
     feignBuilder = Feign.builder()
-                .client(new OkHttpClient())
-                .encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
-                .decoder(new ApiResponseDecoder(objectMapper))
-                .logger(new Slf4jLogger());
+        .encoder(new FormEncoder(new GsonEncoder()))
+        .decoder(new GsonDecoder())
+        .logger(new Slf4jLogger());
   }
 
   public ApiClient(String[] authNames) {
@@ -97,28 +87,8 @@ public class ApiClient {
     return this;
   }
 
-  private ObjectMapper createObjectMapper() {
-    ObjectMapper objectMapper = new ObjectMapper();
-    objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-    objectMapper.disable(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
-    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    objectMapper.setDateFormat(new RFC3339DateFormat());
-    objectMapper.registerModule(new JavaTimeModule());
-    JsonNullableModule jnm = new JsonNullableModule();
-    objectMapper.registerModule(jnm);
-    return objectMapper;
-  }
-
 
-  public ObjectMapper getObjectMapper(){
-    return objectMapper;
-  }
 
-  public void setObjectMapper(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-  }
 
   /**
    * Creates a feign client for given API interface.
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
index b2a52c12a29..236c8190bb8 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -15,27 +15,24 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 /**
  * Category
  */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
   public Category() {
@@ -52,16 +49,12 @@ public class Category {
    * @return id
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -78,16 +71,12 @@ public class Category {
    * @return name
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
     this.name = name;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
index 3484a3d0c6e..0f511d550b7 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -15,49 +15,46 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * Pet
  */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
-  public static final String JSON_PROPERTY_CATEGORY = "category";
+  public static final String SERIALIZED_NAME_CATEGORY = "category";
+  @SerializedName(SERIALIZED_NAME_CATEGORY)
   private Category category;
 
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
+  public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls";
+  @SerializedName(SERIALIZED_NAME_PHOTO_URLS)
   private List<String> photoUrls = new ArrayList<>();
 
-  public static final String JSON_PROPERTY_TAGS = "tags";
+  public static final String SERIALIZED_NAME_TAGS = "tags";
+  @SerializedName(SERIALIZED_NAME_TAGS)
   private List<Tag> tags = null;
 
   /**
    * pet status in the store
    */
+  @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
     AVAILABLE("available"),
     
@@ -71,7 +68,6 @@ public class Pet {
       this.value = value;
     }
 
-    @JsonValue
     public String getValue() {
       return value;
     }
@@ -81,7 +77,6 @@ public class Pet {
       return String.valueOf(value);
     }
 
-    @JsonCreator
     public static StatusEnum fromValue(String value) {
       for (StatusEnum b : StatusEnum.values()) {
         if (b.value.equals(value)) {
@@ -90,9 +85,23 @@ public class Pet {
       }
       throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
+
+    public static class Adapter extends TypeAdapter<StatusEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public StatusEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return StatusEnum.fromValue(value);
+      }
+    }
   }
 
-  public static final String JSON_PROPERTY_STATUS = "status";
+  public static final String SERIALIZED_NAME_STATUS = "status";
+  @SerializedName(SERIALIZED_NAME_STATUS)
   private StatusEnum status;
 
   public Pet() {
@@ -109,16 +118,12 @@ public class Pet {
    * @return id
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -135,16 +140,12 @@ public class Pet {
    * @return name
   **/
   @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public String getName() {
     return name;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setName(String name) {
     this.name = name;
   }
@@ -161,16 +162,12 @@ public class Pet {
    * @return category
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Category getCategory() {
     return category;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCategory(Category category) {
     this.category = category;
   }
@@ -192,16 +189,12 @@ public class Pet {
    * @return photoUrls
   **/
   @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -226,16 +219,12 @@ public class Pet {
    * @return tags
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<Tag> getTags() {
     return tags;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -252,16 +241,12 @@ public class Pet {
    * @return status
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public StatusEnum getStatus() {
     return status;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
index 2da4a88b526..7bfaa5ea05c 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -15,27 +15,24 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 /**
  * Tag
  */
-@JsonPropertyOrder({
-  Tag.JSON_PROPERTY_ID,
-  Tag.JSON_PROPERTY_NAME
-})
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
+  public static final String SERIALIZED_NAME_ID = "id";
+  @SerializedName(SERIALIZED_NAME_ID)
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
+  public static final String SERIALIZED_NAME_NAME = "name";
+  @SerializedName(SERIALIZED_NAME_NAME)
   private String name;
 
   public Tag() {
@@ -52,16 +49,12 @@ public class Tag {
    * @return id
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Long getId() {
     return id;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
     this.id = id;
   }
@@ -78,16 +71,12 @@ public class Tag {
    * @return name
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getName() {
     return name;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
     this.name = name;
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index 4fc23acdc7e..433e40e1376 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -15,26 +15,22 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
  */
-@JsonPropertyOrder({
-  TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.JSON_PROPERTY_VALUES
-})
-@JsonTypeName("test_query_style_form_explode_true_array_string_query_object_parameter")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
-  public static final String JSON_PROPERTY_VALUES = "values";
+  public static final String SERIALIZED_NAME_VALUES = "values";
+  @SerializedName(SERIALIZED_NAME_VALUES)
   private List<String> values = null;
 
   public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() {
@@ -59,16 +55,12 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
    * @return values
   **/
   @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_VALUES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public List<String> getValues() {
     return values;
   }
 
 
-  @JsonProperty(JSON_PROPERTY_VALUES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setValues(List<String> values) {
     this.values = values;
   }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
index cf0f5c871be..65d841c450c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
@@ -92,31 +92,38 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
-src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
-src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
+src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -197,3 +204,4 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
index 2edcfc0a3d2..f9c1c7f7462 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md
@@ -1,277 +1 @@
-# Org.OpenAPITools - the C# library for the OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 1.0.0
-- SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
-
-<a name="frameworks-supported"></a>
-## Frameworks supported
-
-<a name="dependencies"></a>
-## Dependencies
-
-- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
-- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
-- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
-- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
-
-The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-Install-Package Newtonsoft.Json
-Install-Package JsonSubTypes
-Install-Package System.ComponentModel.Annotations
-Install-Package CompareNETObjects
-```
-<a name="installation"></a>
-## Installation
-Run the following command to generate the DLL
-- [Mac/Linux] `/bin/sh build.sh`
-- [Windows] `build.bat`
-
-Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
-```csharp
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-```
-<a name="packaging"></a>
-## Packaging
-
-A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
-
-This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
-
-```
-nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
-```
-
-Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
-
-<a name="usage"></a>
-## Usage
-
-To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
-```csharp
-Configuration c = new Configuration();
-System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
-webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
-c.Proxy = webProxy;
-```
-
-<a name="getting-started"></a>
-## Getting Started
-
-```csharp
-using System.Collections.Generic;
-using System.Diagnostics;
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-
-namespace Example
-{
-    public class Example
-    {
-        public static void Main()
-        {
-
-            Configuration config = new Configuration();
-            config.BasePath = "http://petstore.swagger.io:80/v2";
-            var apiInstance = new AnotherFakeApi(config);
-            var modelClient = new ModelClient(); // ModelClient | client model
-
-            try
-            {
-                // To test special tags
-                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
-                Debug.WriteLine(result);
-            }
-            catch (ApiException e)
-            {
-                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
-                Debug.Print("Status Code: "+ e.ErrorCode);
-                Debug.Print(e.StackTrace);
-            }
-
-        }
-    }
-}
-```
-
-<a name="documentation-for-api-endpoints"></a>
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
-*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
-*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
-
-
-<a name="documentation-for-models"></a>
-## Documentation for Models
-
- - [Model.Activity](docs//modelsActivity.md)
- - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
- - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
- - [Model.Animal](docs//modelsAnimal.md)
- - [Model.ApiResponse](docs//modelsApiResponse.md)
- - [Model.Apple](docs//modelsApple.md)
- - [Model.AppleReq](docs//modelsAppleReq.md)
- - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
- - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
- - [Model.ArrayTest](docs//modelsArrayTest.md)
- - [Model.Banana](docs//modelsBanana.md)
- - [Model.BananaReq](docs//modelsBananaReq.md)
- - [Model.BasquePig](docs//modelsBasquePig.md)
- - [Model.Capitalization](docs//modelsCapitalization.md)
- - [Model.Cat](docs//modelsCat.md)
- - [Model.CatAllOf](docs//modelsCatAllOf.md)
- - [Model.Category](docs//modelsCategory.md)
- - [Model.ChildCat](docs//modelsChildCat.md)
- - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
- - [Model.ClassModel](docs//modelsClassModel.md)
- - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
- - [Model.DanishPig](docs//modelsDanishPig.md)
- - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
- - [Model.Dog](docs//modelsDog.md)
- - [Model.DogAllOf](docs//modelsDogAllOf.md)
- - [Model.Drawing](docs//modelsDrawing.md)
- - [Model.EnumArrays](docs//modelsEnumArrays.md)
- - [Model.EnumClass](docs//modelsEnumClass.md)
- - [Model.EnumTest](docs//modelsEnumTest.md)
- - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
- - [Model.File](docs//modelsFile.md)
- - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
- - [Model.Foo](docs//modelsFoo.md)
- - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
- - [Model.FormatTest](docs//modelsFormatTest.md)
- - [Model.Fruit](docs//modelsFruit.md)
- - [Model.FruitReq](docs//modelsFruitReq.md)
- - [Model.GmFruit](docs//modelsGmFruit.md)
- - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
- - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
- - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
- - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
- - [Model.List](docs//modelsList.md)
- - [Model.Mammal](docs//modelsMammal.md)
- - [Model.MapTest](docs//modelsMapTest.md)
- - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model.Model200Response](docs//modelsModel200Response.md)
- - [Model.ModelClient](docs//modelsModelClient.md)
- - [Model.Name](docs//modelsName.md)
- - [Model.NullableClass](docs//modelsNullableClass.md)
- - [Model.NullableShape](docs//modelsNullableShape.md)
- - [Model.NumberOnly](docs//modelsNumberOnly.md)
- - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
- - [Model.Order](docs//modelsOrder.md)
- - [Model.OuterComposite](docs//modelsOuterComposite.md)
- - [Model.OuterEnum](docs//modelsOuterEnum.md)
- - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
- - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
- - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
- - [Model.ParentPet](docs//modelsParentPet.md)
- - [Model.Pet](docs//modelsPet.md)
- - [Model.Pig](docs//modelsPig.md)
- - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
- - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
- - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
- - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
- - [Model.Return](docs//modelsReturn.md)
- - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
- - [Model.Shape](docs//modelsShape.md)
- - [Model.ShapeInterface](docs//modelsShapeInterface.md)
- - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
- - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
- - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
- - [Model.Tag](docs//modelsTag.md)
- - [Model.Triangle](docs//modelsTriangle.md)
- - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
- - [Model.User](docs//modelsUser.md)
- - [Model.Whale](docs//modelsWhale.md)
- - [Model.Zebra](docs//modelsZebra.md)
-
-
-<a name="documentation-for-authorization"></a>
-## Documentation for Authorization
-
-<a name="api_key"></a>
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-<a name="api_key_query"></a>
-### api_key_query
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-<a name="bearer_test"></a>
-### bearer_test
-
-- **Type**: Bearer Authentication
-
-<a name="http_basic_test"></a>
-### http_basic_test
-
-- **Type**: HTTP basic authentication
-
-<a name="http_signature_test"></a>
-### http_signature_test
-
-
-<a name="petstore_auth"></a>
-### petstore_auth
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-
+# Created with Openapi Generator
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
index a179355d603..77826f0673b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (string query, User user)
+> void TestBodyWithQueryParams (User user, string query)
 
 
 
@@ -652,12 +652,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var query = "query_example";  // string | 
             var user = new User(); // User | 
+            var query = "query_example";  // string | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(query, user);
+                apiInstance.TestBodyWithQueryParams(user, query);
             }
             catch (ApiException  e)
             {
@@ -676,7 +676,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
 }
 catch (ApiException e)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **query** | **string** |  |  |
 | **user** | [**User**](User.md) |  |  |
+| **query** | **string** |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string? _string = null, System.IO.Stream? binary = null, DateTime? date = null, string? password = null, string? callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
+            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | 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 _float = 3.4F;  // float? | None (optional) 
             var integer = 56;  // int? | None (optional) 
             var int32 = 56;  // int? | None (optional) 
             var int64 = 789L;  // long? | None (optional) 
-            var _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
+| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **_byte** | **byte[]** | None |  |
+| **date** | **DateTime?** | None | [optional]  |
+| **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
 | **_string** | **string?** | None | [optional]  |
-| **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
-| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string?** | None | [optional]  |
 | **callback** | **string?** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string>? enumHeaderStringArray = null, List<string>? enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string? enumHeaderString = null, string? enumQueryString = null, List<string>? enumFormStringArray = null, string? enumFormString = null)
+> 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)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>?(); // List<string>? | Header parameter enum test (string array) (optional) 
             var enumQueryStringArray = new List<string>?(); // List<string>? | Query parameter enum test (string array) (optional) 
-            var enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
             var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
+            var enumQueryInteger = 1;  // int? | 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 enumFormStringArray = new List<string>?(); // List<string>? | Form parameter enum test (string array) (optional)  (default to $)
             var enumFormString = "_abc";  // string? | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;?**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;?**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
+| **enumQueryInteger** | **int?** | 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] |
-| **enumFormStringArray** | [**List&lt;string&gt;?**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string?** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
+> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1053,17 +1053,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
+            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var booleanGroup = true;  // bool? | Boolean in group parameters (optional) 
+            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var int64Group = 789L;  // long? | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1083,7 +1083,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1097,11 +1097,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
+| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **booleanGroup** | **bool?** | Boolean in group parameters | [optional]  |
+| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **int64Group** | **long?** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
index 4187e44c57d..d5e8e8330a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, string? additionalMetadata = null, System.IO.Stream? file = null)
+> ApiResponse UploadFile (long petId, System.IO.Stream? file = null, string? additionalMetadata = null)
 
 uploads an image
 
@@ -689,13 +689,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            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) 
+            var additionalMetadata = "additionalMetadata_example";  // string? | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
+                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -716,7 +716,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -734,8 +734,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **additionalMetadata** | **string?** | Additional data to pass to server | [optional]  |
 | **file** | **System.IO.Stream?****System.IO.Stream?** | file to upload | [optional]  |
+| **additionalMetadata** | **string?** | Additional data to pass to server | [optional]  |
 
 ### Return type
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string? additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string? additionalMetadata = null)
 
 uploads an image (required)
 
@@ -784,14 +784,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            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 petId = 789L;  // long | ID of pet to update
             var additionalMetadata = "additionalMetadata_example";  // string? | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -812,7 +812,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -829,8 +829,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **petId** | **long** | ID of pet to update |  |
 | **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
+| **petId** | **long** | ID of pet to update |  |
 | **additionalMetadata** | **string?** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
index fd1c1a7d62b..a862c8c112a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (string username, User user)
+> void UpdateUser (User user, string username)
 
 Updated user
 
@@ -646,13 +646,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var username = "username_example";  // string | name that need to be deleted
             var user = new User(); // User | Updated user object
+            var username = "username_example";  // string | name that need to be deleted
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(username, user);
+                apiInstance.UpdateUser(user, username);
             }
             catch (ApiException  e)
             {
@@ -672,7 +672,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(username, user);
+    apiInstance.UpdateUserWithHttpInfo(user, username);
 }
 catch (ApiException e)
 {
@@ -686,8 +686,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **username** | **string** | name that need to be deleted |  |
 | **user** | [**User**](User.md) | Updated user object |  |
+| **username** | **string** | name that need to be deleted |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
index 1f919450009..f79869f95a7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [optional] 
+**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
index bc808ceeae3..d89ed1a25dc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Type** | **string** |  | [optional] 
 **Message** | **string** |  | [optional] 
+**Type** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
index 32365e6d4d0..ed572120cd6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
+**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
index fde98a967ef..9e225c17232 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SmallCamel** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
+**SmallSnake** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
index c2cf3f8e919..6eb0a2e13ea 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [default to "default-name"]
 **Id** | **long** |  | [optional] 
+**Name** | **string** |  | [default to "default-name"]
 
 [[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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
index bb35816c914..a098828a04f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Class** | **string** |  | [optional] 
+**ClassProperty** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
index 18117e6c938..fcee9662afb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
 **Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
+**NullableShape** | [**NullableShape**](NullableShape.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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
index 2a27962cc52..7467f67978c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | **string** |  | [optional] 
 **ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
+**JustSymbol** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
index 71602270bab..53bbfe31e77 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **string** |  | 
-**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [optional] 
-**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**EnumString** | **string** |  | [optional] 
+**EnumStringRequired** | **string** |  | 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
index 47e50daca3e..78c99facf59 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**String** | [**Foo**](Foo.md) |  | [optional] 
+**StringProperty** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
index 0b92c2fb10a..4e34a6d18b3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Number** | **decimal** |  | 
-**Byte** | **byte[]** |  | 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**ByteProperty** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**Password** | **string** |  | 
-**Integer** | **int** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**DecimalProperty** | **decimal** |  | [optional] 
+**DoubleProperty** | **double** |  | [optional] 
+**FloatProperty** | **float** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Float** | **float** |  | [optional] 
-**Double** | **double** |  | [optional] 
-**Decimal** | **decimal** |  | [optional] 
-**String** | **string** |  | [optional] 
-**Binary** | **System.IO.Stream** |  | [optional] 
-**DateTime** | **DateTime** |  | [optional] 
-**Uuid** | **Guid** |  | [optional] 
+**Integer** | **int** |  | [optional] 
+**Number** | **decimal** |  | 
+**Password** | **string** |  | 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
+**StringProperty** | **string** |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
index aaee09f7870..5dd27228bb0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 031d2b96065..0bac85a8e83 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
index 8bc8049f46f..93139e1d1aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
-**Class** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
index 9e0e83645f3..51cf0636e72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_Client** | **string** |  | [optional] 
+**_ClientProperty** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
index 2ee782c0c54..11f49b9fd40 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**SnakeCase** | **int** |  | [optional] [readonly] 
 **Property** | **string** |  | [optional] 
+**SnakeCase** | **int** |  | [optional] [readonly] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
index d4a19d1856b..ac86336ea70 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**StringProp** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
index b737f7d757a..9f44c24d19a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **string** |  | [optional] 
-**Id** | **decimal** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
 **Bars** | **List&lt;string&gt;** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**Uuid** | **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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
index abf676810fb..8985c59d094 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
-**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
index 7de10304abf..b13bb576b45 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Category** | [**Category**](Category.md) |  | [optional] 
+**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Id** | **long** |  | [optional] 
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
 **Status** | **string** | pet status in the store | [optional] 
+**Tags** | [**List&lt;Tag&gt;**](Tag.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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
index 662fa6f4a38..b48f3490005 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialPropertyName** | **long** |  | [optional] 
 **SpecialModelNameProperty** | **string** |  | [optional] 
+**SpecialPropertyName** | **long** |  | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
index a0f0d223899..455f031674d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
-**Username** | **string** |  | [optional] 
+**Email** | **string** |  | [optional] 
 **FirstName** | **string** |  | [optional] 
+**Id** | **long** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**Email** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
+**Username** | **string** |  | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index c201ed08dc6..a74ad308ba2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -185,8 +185,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient? OnCall123TestSpecialTags(ModelClient? modelClient)
+        protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -195,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterCall123TestSpecialTags(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
+        protected virtual void AfterCall123TestSpecialTags(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
         {
         }
 
@@ -206,7 +215,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorCall123TestSpecialTags(Exception exception, string pathFormat, string path, ModelClient? modelClient)
+        protected virtual void OnErrorCall123TestSpecialTags(Exception exception, string pathFormat, string path, ModelClient modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -218,7 +227,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
index a6f30afe042..8732ee2357c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool?&gt;&gt;</returns>
-        Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -94,7 +94,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool?&gt;</returns>
-        Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -106,7 +106,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;OuterComposite?&gt;&gt;</returns>
-        Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -118,7 +118,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;OuterComposite&gt;</returns>
-        Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -129,7 +129,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;OuterComposite?&gt;</returns>
-        Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -141,7 +141,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal?&gt;&gt;</returns>
-        Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -153,7 +153,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal?&gt;</returns>
-        Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -176,7 +176,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string?&gt;&gt;</returns>
-        Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -188,7 +188,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> FakeOuterStringSerializeAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> FakeOuterStringSerializeAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string?&gt;</returns>
-        Task<string?> FakeOuterStringSerializeOrDefaultAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string?> FakeOuterStringSerializeOrDefaultAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Array of Enums
@@ -243,7 +243,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -255,7 +255,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -266,7 +266,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -275,11 +275,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -288,11 +288,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -300,11 +300,11 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -316,7 +316,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -328,7 +328,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -339,7 +339,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -348,23 +348,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -373,23 +373,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -397,23 +397,23 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -424,15 +424,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -443,15 +443,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -461,15 +461,15 @@ namespace Org.OpenAPITools.IApi
         /// </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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -478,15 +478,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -495,15 +495,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -511,15 +511,15 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -531,7 +531,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -543,7 +543,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -554,7 +554,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -567,7 +567,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -580,7 +580,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -592,7 +592,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -608,7 +608,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -624,7 +624,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -639,7 +639,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -853,7 +853,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool?> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -870,7 +870,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool?> FakeOuterBooleanSerializeOrDefaultAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool?>? result = null;
             try 
@@ -924,7 +924,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool?>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1001,7 +1001,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="OuterComposite"/>&gt;</returns>
-        public async Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<OuterComposite> FakeOuterCompositeSerializeAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<OuterComposite?> result = await FakeOuterCompositeSerializeWithHttpInfoAsync(outerComposite, cancellationToken).ConfigureAwait(false);
 
@@ -1018,7 +1018,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="OuterComposite"/>&gt;</returns>
-        public async Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<OuterComposite?> FakeOuterCompositeSerializeOrDefaultAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<OuterComposite?>? result = null;
             try 
@@ -1072,7 +1072,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="outerComposite">Input composite as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="OuterComposite"/></returns>
-        public async Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<OuterComposite?>> FakeOuterCompositeSerializeWithHttpInfoAsync(OuterComposite? outerComposite = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1149,7 +1149,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal?> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -1166,7 +1166,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal?> FakeOuterNumberSerializeOrDefaultAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal?>? result = null;
             try 
@@ -1220,7 +1220,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal?>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1297,7 +1297,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> FakeOuterStringSerializeAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> FakeOuterStringSerializeAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?> result = await FakeOuterStringSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -1314,7 +1314,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string?> FakeOuterStringSerializeOrDefaultAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string?> FakeOuterStringSerializeOrDefaultAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?>? result = null;
             try 
@@ -1368,7 +1368,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input string as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string?>> FakeOuterStringSerializeWithHttpInfoAsync(string? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1574,7 +1574,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1591,7 +1591,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1612,8 +1612,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="fileSchemaTestClass"></param>
         /// <returns></returns>
-        protected virtual FileSchemaTestClass? OnTestBodyWithFileSchema(FileSchemaTestClass? fileSchemaTestClass)
+        protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (fileSchemaTestClass == null)
+                throw new ArgumentNullException(nameof(fileSchemaTestClass));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return fileSchemaTestClass;
         }
 
@@ -1622,7 +1631,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="fileSchemaTestClass"></param>
-        protected virtual void AfterTestBodyWithFileSchema(ApiResponse<object?> apiResponse, FileSchemaTestClass? fileSchemaTestClass)
+        protected virtual void AfterTestBodyWithFileSchema(ApiResponse<object?> apiResponse, FileSchemaTestClass fileSchemaTestClass)
         {
         }
 
@@ -1633,7 +1642,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="fileSchemaTestClass"></param>
-        protected virtual void OnErrorTestBodyWithFileSchema(Exception exception, string pathFormat, string path, FileSchemaTestClass? fileSchemaTestClass)
+        protected virtual void OnErrorTestBodyWithFileSchema(Exception exception, string pathFormat, string path, FileSchemaTestClass fileSchemaTestClass)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1645,7 +1654,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1710,13 +1719,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1728,16 +1737,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1751,21 +1760,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        protected virtual (string?, User?) OnTestBodyWithQueryParams(string? query, User? user)
+        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
         {
-            return (query, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (query == null)
+                throw new ArgumentNullException(nameof(query));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, query);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object?> apiResponse, string? query, User? user)
+        /// <param name="query"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object?> apiResponse, User user, string query)
         {
         }
 
@@ -1775,9 +1796,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string? query, User? user)
+        /// <param name="query"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1786,19 +1807,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(query, user);
-                query = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(user, query);
+                user = validatedParameters.Item1;
+                query = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1845,7 +1866,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, query, user);
+                            AfterTestBodyWithQueryParams(apiResponse, user, query);
                         }
 
                         return apiResponse;
@@ -1854,7 +1875,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
                 throw;
             }
         }
@@ -1866,7 +1887,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1883,7 +1904,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -1904,8 +1925,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient? OnTestClientModel(ModelClient? modelClient)
+        protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -1914,7 +1944,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterTestClientModel(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
+        protected virtual void AfterTestClientModel(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
         {
         }
 
@@ -1925,7 +1955,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorTestClientModel(Exception exception, string pathFormat, string path, ModelClient? modelClient)
+        protected virtual void OnErrorTestClientModel(Exception exception, string pathFormat, string path, ModelClient modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1937,7 +1967,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2011,25 +2041,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2041,28 +2071,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object?> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2076,45 +2106,63 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (decimal?, double?, string?, byte[]?, int?, int?, long?, float?, string?, System.IO.Stream?, DateTime?, string?, string?, DateTime?) OnTestEndpointParameters(decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
+        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream?, float?, int?, int?, long?, string?, string?, string?, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
         {
-            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (_byte == null)
+                throw new ArgumentNullException(nameof(_byte));
+
+            if (number == null)
+                throw new ArgumentNullException(nameof(number));
+
+            if (_double == null)
+                throw new ArgumentNullException(nameof(_double));
+
+            if (patternWithoutDelimiter == null)
+                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object?> apiResponse, decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object?> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
         {
         }
 
@@ -2124,21 +2172,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal? number, double? _double, string? patternWithoutDelimiter, byte[]? _byte, int? integer, int? int32, long? int64, float? _float, string? _string, System.IO.Stream? binary, DateTime? date, string? password, string? callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream? binary, float? _float, int? integer, int? int32, long? int64, string? _string, string? password, string? callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2147,40 +2195,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream? binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string? _string = null, string? password = null, string? callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
-                number = validatedParameters.Item1;
-                _double = validatedParameters.Item2;
-                patternWithoutDelimiter = validatedParameters.Item3;
-                _byte = validatedParameters.Item4;
-                integer = validatedParameters.Item5;
-                int32 = validatedParameters.Item6;
-                int64 = validatedParameters.Item7;
-                _float = validatedParameters.Item8;
-                _string = validatedParameters.Item9;
-                binary = validatedParameters.Item10;
-                date = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                _byte = validatedParameters.Item1;
+                number = validatedParameters.Item2;
+                _double = validatedParameters.Item3;
+                patternWithoutDelimiter = validatedParameters.Item4;
+                date = validatedParameters.Item5;
+                binary = validatedParameters.Item6;
+                _float = validatedParameters.Item7;
+                integer = validatedParameters.Item8;
+                int32 = validatedParameters.Item9;
+                int64 = validatedParameters.Item10;
+                _string = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -2200,6 +2248,10 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
+                    formParams.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(_byte)));
+
+
+
                     formParams.Add(new KeyValuePair<string?, string?>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -2210,9 +2262,14 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string?, string?>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
 
-                    formParams.Add(new KeyValuePair<string?, string?>("byte", ClientUtils.ParameterToString(_byte)));
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(_float)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string?, string?>("integer", ClientUtils.ParameterToString(integer)));
@@ -2223,18 +2280,9 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string?, string?>("int64", ClientUtils.ParameterToString(int64)));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string?, string?>("float", ClientUtils.ParameterToString(_float)));
-
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string?, string?>("string", ClientUtils.ParameterToString(_string)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
-
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string?, string?>("date", ClientUtils.ParameterToString(date)));
-
                     if (password != null)
                         formParams.Add(new KeyValuePair<string?, string?>("password", ClientUtils.ParameterToString(password)));
 
@@ -2280,7 +2328,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2292,7 +2340,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                 throw;
             }
         }
@@ -2303,17 +2351,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2327,20 +2375,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object?> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2356,16 +2404,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>?, List<string>?, int?, double?, string?, string?, List<string>?, string?) OnTestEnumParameters(List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
+        protected virtual (List<string>?, List<string>?, double?, int?, List<string>?, string?, string?, string?) OnTestEnumParameters(List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
         }
 
         /// <summary>
@@ -2374,13 +2422,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object?> apiResponse, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object?> apiResponse, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
         {
         }
 
@@ -2392,13 +2440,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string? enumHeaderString, string? enumQueryString, List<string>? enumFormStringArray, string? enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string>? enumHeaderStringArray, List<string>? enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string>? enumFormStringArray, string? enumHeaderString, string? enumQueryString, string? enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2409,28 +2457,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryInteger = validatedParameters.Item3;
-                enumQueryDouble = validatedParameters.Item4;
-                enumHeaderString = validatedParameters.Item5;
-                enumQueryString = validatedParameters.Item6;
-                enumFormStringArray = validatedParameters.Item7;
+                enumQueryDouble = validatedParameters.Item3;
+                enumQueryInteger = validatedParameters.Item4;
+                enumFormStringArray = validatedParameters.Item5;
+                enumHeaderString = validatedParameters.Item6;
+                enumQueryString = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2444,12 +2492,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()!);
 
-                    if (enumQueryInteger != null)
-                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()!);
-
                     if (enumQueryDouble != null)
                         parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()!);
 
+                    if (enumQueryInteger != null)
+                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()!);
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()!);
 
@@ -2501,7 +2549,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                         }
 
                         return apiResponse;
@@ -2510,7 +2558,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 throw;
             }
         }
@@ -2519,17 +2567,17 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2541,20 +2589,20 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object?> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2568,29 +2616,44 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
         /// <returns></returns>
-        protected virtual (int?, bool?, long?, int?, bool?, long?) OnTestGroupParameters(int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
-            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredBooleanGroup == null)
+                throw new ArgumentNullException(nameof(requiredBooleanGroup));
+
+            if (requiredStringGroup == null)
+                throw new ArgumentNullException(nameof(requiredStringGroup));
+
+            if (requiredInt64Group == null)
+                throw new ArgumentNullException(nameof(requiredInt64Group));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object?> apiResponse, int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object?> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
         }
 
@@ -2600,13 +2663,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int? requiredStringGroup, bool? requiredBooleanGroup, long? requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2615,26 +2678,26 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-                requiredStringGroup = validatedParameters.Item1;
-                requiredBooleanGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                requiredBooleanGroup = validatedParameters.Item1;
+                requiredStringGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                stringGroup = validatedParameters.Item4;
-                booleanGroup = validatedParameters.Item5;
+                booleanGroup = validatedParameters.Item4;
+                stringGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2689,7 +2752,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2701,7 +2764,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                 throw;
             }
         }
@@ -2713,7 +2776,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2730,7 +2793,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -2751,8 +2814,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="requestBody"></param>
         /// <returns></returns>
-        protected virtual Dictionary<string, string>? OnTestInlineAdditionalProperties(Dictionary<string, string>? requestBody)
+        protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requestBody == null)
+                throw new ArgumentNullException(nameof(requestBody));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return requestBody;
         }
 
@@ -2761,7 +2833,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="requestBody"></param>
-        protected virtual void AfterTestInlineAdditionalProperties(ApiResponse<object?> apiResponse, Dictionary<string, string>? requestBody)
+        protected virtual void AfterTestInlineAdditionalProperties(ApiResponse<object?> apiResponse, Dictionary<string, string> requestBody)
         {
         }
 
@@ -2772,7 +2844,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="requestBody"></param>
-        protected virtual void OnErrorTestInlineAdditionalProperties(Exception exception, string pathFormat, string path, Dictionary<string, string>? requestBody)
+        protected virtual void OnErrorTestInlineAdditionalProperties(Exception exception, string pathFormat, string path, Dictionary<string, string> requestBody)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2784,7 +2856,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2853,7 +2925,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2871,7 +2943,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -2893,8 +2965,20 @@ namespace Org.OpenAPITools.Api
         /// <param name="param"></param>
         /// <param name="param2"></param>
         /// <returns></returns>
-        protected virtual (string?, string?) OnTestJsonFormData(string? param, string? param2)
+        protected virtual (string, string) OnTestJsonFormData(string param, string param2)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (param == null)
+                throw new ArgumentNullException(nameof(param));
+
+            if (param2 == null)
+                throw new ArgumentNullException(nameof(param2));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (param, param2);
         }
 
@@ -2904,7 +2988,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="param"></param>
         /// <param name="param2"></param>
-        protected virtual void AfterTestJsonFormData(ApiResponse<object?> apiResponse, string? param, string? param2)
+        protected virtual void AfterTestJsonFormData(ApiResponse<object?> apiResponse, string param, string param2)
         {
         }
 
@@ -2916,7 +3000,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="param"></param>
         /// <param name="param2"></param>
-        protected virtual void OnErrorTestJsonFormData(Exception exception, string pathFormat, string path, string? param, string? param2)
+        protected virtual void OnErrorTestJsonFormData(Exception exception, string pathFormat, string path, string param, string param2)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2929,7 +3013,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -3013,7 +3097,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -3034,7 +3118,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -3059,8 +3143,29 @@ namespace Org.OpenAPITools.Api
         /// <param name="url"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        protected virtual (List<string>?, List<string>?, List<string>?, List<string>?, List<string>?) OnTestQueryParameterCollectionFormat(List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
+        protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pipe == null)
+                throw new ArgumentNullException(nameof(pipe));
+
+            if (ioutil == null)
+                throw new ArgumentNullException(nameof(ioutil));
+
+            if (http == null)
+                throw new ArgumentNullException(nameof(http));
+
+            if (url == null)
+                throw new ArgumentNullException(nameof(url));
+
+            if (context == null)
+                throw new ArgumentNullException(nameof(context));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (pipe, ioutil, http, url, context);
         }
 
@@ -3073,7 +3178,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="http"></param>
         /// <param name="url"></param>
         /// <param name="context"></param>
-        protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse<object?> apiResponse, List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
+        protected virtual void AfterTestQueryParameterCollectionFormat(ApiResponse<object?> apiResponse, List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
         }
 
@@ -3088,7 +3193,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="http"></param>
         /// <param name="url"></param>
         /// <param name="context"></param>
-        protected virtual void OnErrorTestQueryParameterCollectionFormat(Exception exception, string pathFormat, string path, List<string>? pipe, List<string>? ioutil, List<string>? http, List<string>? url, List<string>? context)
+        protected virtual void OnErrorTestQueryParameterCollectionFormat(Exception exception, string pathFormat, string path, List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -3104,7 +3209,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 8d7c799073a..4bdb85c7203 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient?&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient?&gt;</returns>
-        Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient?> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient?>? result = null;
             try 
@@ -185,8 +185,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="modelClient"></param>
         /// <returns></returns>
-        protected virtual ModelClient? OnTestClassname(ModelClient? modelClient)
+        protected virtual ModelClient OnTestClassname(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -195,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="modelClient"></param>
-        protected virtual void AfterTestClassname(ApiResponse<ModelClient?> apiResponse, ModelClient? modelClient)
+        protected virtual void AfterTestClassname(ApiResponse<ModelClient?> apiResponse, ModelClient modelClient)
         {
         }
 
@@ -206,7 +215,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="modelClient"></param>
-        protected virtual void OnErrorTestClassname(Exception exception, string pathFormat, string path, ModelClient? modelClient)
+        protected virtual void OnErrorTestClassname(Exception exception, string pathFormat, string path, ModelClient modelClient)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -218,7 +227,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient?>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
index 584926ff8cf..0e46e92ad02 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -88,7 +88,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -100,7 +100,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeletePetOrDefaultAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -112,7 +112,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;?&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -124,7 +124,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;?&gt;</returns>
-        Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;?&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -170,7 +170,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;?&gt;</returns>
-        Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet?&gt;&gt;</returns>
-        Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -194,7 +194,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -205,7 +205,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet?&gt;</returns>
-        Task<Pet?> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet?> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -217,7 +217,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -229,7 +229,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -240,7 +240,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -254,7 +254,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -268,7 +268,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -281,7 +281,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdatePetWithFormOrDefaultAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -291,11 +291,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse?&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -305,11 +305,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -318,11 +318,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse?&gt;</returns>
-        Task<ApiResponse?> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse?> UploadFileOrDefaultAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -331,12 +331,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse?&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -345,12 +345,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -358,12 +358,12 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse?&gt;</returns>
-        Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -448,7 +448,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -465,7 +465,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -486,8 +486,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="pet"></param>
         /// <returns></returns>
-        protected virtual Pet? OnAddPet(Pet? pet)
+        protected virtual Pet OnAddPet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -496,7 +505,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="pet"></param>
-        protected virtual void AfterAddPet(ApiResponse<object?> apiResponse, Pet? pet)
+        protected virtual void AfterAddPet(ApiResponse<object?> apiResponse, Pet pet)
         {
         }
 
@@ -507,7 +516,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="pet"></param>
-        protected virtual void OnErrorAddPet(Exception exception, string pathFormat, string path, Pet? pet)
+        protected virtual void OnErrorAddPet(Exception exception, string pathFormat, string path, Pet pet)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -519,7 +528,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -611,7 +620,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -629,7 +638,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeletePetOrDefaultAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -651,8 +660,17 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
         /// <returns></returns>
-        protected virtual (long?, string?) OnDeletePet(long? petId, string? apiKey)
+        protected virtual (long, string?) OnDeletePet(long petId, string? apiKey)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, apiKey);
         }
 
@@ -662,7 +680,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
-        protected virtual void AfterDeletePet(ApiResponse<object?> apiResponse, long? petId, string? apiKey)
+        protected virtual void AfterDeletePet(ApiResponse<object?> apiResponse, long petId, string? apiKey)
         {
         }
 
@@ -674,7 +692,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="petId"></param>
         /// <param name="apiKey"></param>
-        protected virtual void OnErrorDeletePet(Exception exception, string pathFormat, string path, long? petId, string? apiKey)
+        protected virtual void OnErrorDeletePet(Exception exception, string pathFormat, string path, long petId, string? apiKey)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -687,7 +705,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeletePetWithHttpInfoAsync(long petId, string? apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -758,7 +776,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -775,7 +793,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>?> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?>? result = null;
             try 
@@ -796,8 +814,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="status"></param>
         /// <returns></returns>
-        protected virtual List<string>? OnFindPetsByStatus(List<string>? status)
+        protected virtual List<string> OnFindPetsByStatus(List<string> status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (status == null)
+                throw new ArgumentNullException(nameof(status));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return status;
         }
 
@@ -806,7 +833,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="status"></param>
-        protected virtual void AfterFindPetsByStatus(ApiResponse<List<Pet>?> apiResponse, List<string>? status)
+        protected virtual void AfterFindPetsByStatus(ApiResponse<List<Pet>?> apiResponse, List<string> status)
         {
         }
 
@@ -817,7 +844,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="status"></param>
-        protected virtual void OnErrorFindPetsByStatus(Exception exception, string pathFormat, string path, List<string>? status)
+        protected virtual void OnErrorFindPetsByStatus(Exception exception, string pathFormat, string path, List<string> status)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -829,7 +856,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>?>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -922,7 +949,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -939,7 +966,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>?> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>?>? result = null;
             try 
@@ -960,8 +987,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="tags"></param>
         /// <returns></returns>
-        protected virtual List<string>? OnFindPetsByTags(List<string>? tags)
+        protected virtual List<string> OnFindPetsByTags(List<string> tags)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (tags == null)
+                throw new ArgumentNullException(nameof(tags));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return tags;
         }
 
@@ -970,7 +1006,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="tags"></param>
-        protected virtual void AfterFindPetsByTags(ApiResponse<List<Pet>?> apiResponse, List<string>? tags)
+        protected virtual void AfterFindPetsByTags(ApiResponse<List<Pet>?> apiResponse, List<string> tags)
         {
         }
 
@@ -981,7 +1017,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="tags"></param>
-        protected virtual void OnErrorFindPetsByTags(Exception exception, string pathFormat, string path, List<string>? tags)
+        protected virtual void OnErrorFindPetsByTags(Exception exception, string pathFormat, string path, List<string> tags)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -993,7 +1029,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>?>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1086,7 +1122,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet?> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -1103,7 +1139,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet?> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet?> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet?>? result = null;
             try 
@@ -1124,8 +1160,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="petId"></param>
         /// <returns></returns>
-        protected virtual long? OnGetPetById(long? petId)
+        protected virtual long OnGetPetById(long petId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return petId;
         }
 
@@ -1134,7 +1179,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        protected virtual void AfterGetPetById(ApiResponse<Pet?> apiResponse, long? petId)
+        protected virtual void AfterGetPetById(ApiResponse<Pet?> apiResponse, long petId)
         {
         }
 
@@ -1145,7 +1190,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        protected virtual void OnErrorGetPetById(Exception exception, string pathFormat, string path, long? petId)
+        protected virtual void OnErrorGetPetById(Exception exception, string pathFormat, string path, long petId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1157,7 +1202,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet?>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1231,7 +1276,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1248,7 +1293,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1269,8 +1314,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="pet"></param>
         /// <returns></returns>
-        protected virtual Pet? OnUpdatePet(Pet? pet)
+        protected virtual Pet OnUpdatePet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -1279,7 +1333,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="pet"></param>
-        protected virtual void AfterUpdatePet(ApiResponse<object?> apiResponse, Pet? pet)
+        protected virtual void AfterUpdatePet(ApiResponse<object?> apiResponse, Pet pet)
         {
         }
 
@@ -1290,7 +1344,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="pet"></param>
-        protected virtual void OnErrorUpdatePet(Exception exception, string pathFormat, string path, Pet? pet)
+        protected virtual void OnErrorUpdatePet(Exception exception, string pathFormat, string path, Pet pet)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1302,7 +1356,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1395,7 +1449,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1414,7 +1468,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdatePetWithFormOrDefaultAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -1437,8 +1491,17 @@ namespace Org.OpenAPITools.Api
         /// <param name="name"></param>
         /// <param name="status"></param>
         /// <returns></returns>
-        protected virtual (long?, string?, string?) OnUpdatePetWithForm(long? petId, string? name, string? status)
+        protected virtual (long, string?, string?) OnUpdatePetWithForm(long petId, string? name, string? status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, name, status);
         }
 
@@ -1449,7 +1512,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="name"></param>
         /// <param name="status"></param>
-        protected virtual void AfterUpdatePetWithForm(ApiResponse<object?> apiResponse, long? petId, string? name, string? status)
+        protected virtual void AfterUpdatePetWithForm(ApiResponse<object?> apiResponse, long petId, string? name, string? status)
         {
         }
 
@@ -1462,7 +1525,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId"></param>
         /// <param name="name"></param>
         /// <param name="status"></param>
-        protected virtual void OnErrorUpdatePetWithForm(Exception exception, string pathFormat, string path, long? petId, string? name, string? status)
+        protected virtual void OnErrorUpdatePetWithForm(Exception exception, string pathFormat, string path, long petId, string? name, string? status)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1476,7 +1539,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdatePetWithFormWithHttpInfoAsync(long petId, string? name = null, string? status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1564,13 +1627,13 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse?> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse?> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1583,16 +1646,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse?> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse?> UploadFileOrDefaultAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse?>? result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1607,12 +1670,21 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
+        /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long?, string?, System.IO.Stream?) OnUploadFile(long? petId, string? additionalMetadata, System.IO.Stream? file)
+        protected virtual (long, System.IO.Stream?, string?) OnUploadFile(long petId, System.IO.Stream? file, string? additionalMetadata)
         {
-            return (petId, additionalMetadata, file);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (petId, file, additionalMetadata);
         }
 
         /// <summary>
@@ -1620,9 +1692,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse?> apiResponse, long? petId, string? additionalMetadata, System.IO.Stream? file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse?> apiResponse, long petId, System.IO.Stream? file, string? additionalMetadata)
         {
         }
 
@@ -1633,9 +1705,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long? petId, string? additionalMetadata, System.IO.Stream? file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream? file, string? additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1645,20 +1717,20 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse?>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream? file = null, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
+                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
                 petId = validatedParameters.Item1;
-                additionalMetadata = validatedParameters.Item2;
-                file = validatedParameters.Item3;
+                file = validatedParameters.Item2;
+                additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1673,12 +1745,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string?, string?>> formParams = new List<KeyValuePair<string?, string?>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
-                        formParams.Add(new KeyValuePair<string?, string?>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
-
-                    if (file != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
                         multipartContent.Add(new StreamContent(file));
 
+                    if (additionalMetadata != null)
+                        formParams.Add(new KeyValuePair<string?, string?>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1724,7 +1796,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
+                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1736,7 +1808,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
                 throw;
             }
         }
@@ -1745,14 +1817,14 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse?> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse?> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1764,17 +1836,17 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse?>? result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1788,23 +1860,35 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long?, System.IO.Stream?, string?) OnUploadFileWithRequiredFile(long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
+        protected virtual (System.IO.Stream, long, string?) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string? additionalMetadata)
         {
-            return (petId, requiredFile, additionalMetadata);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredFile == null)
+                throw new ArgumentNullException(nameof(requiredFile));
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredFile, petId, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse?> apiResponse, long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse?> apiResponse, System.IO.Stream requiredFile, long petId, string? additionalMetadata)
         {
         }
 
@@ -1814,10 +1898,10 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long? petId, System.IO.Stream? requiredFile, string? additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string? additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1826,20 +1910,20 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse?>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string? additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-                petId = validatedParameters.Item1;
-                requiredFile = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                requiredFile = validatedParameters.Item1;
+                petId = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1906,7 +1990,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1918,7 +2002,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
index f6e1731d770..de9a6972e9e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -106,7 +106,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order?&gt;&gt;</returns>
-        Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -118,7 +118,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -129,7 +129,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order?&gt;</returns>
-        Task<Order?> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order?> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -141,7 +141,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order?&gt;&gt;</returns>
-        Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -153,7 +153,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order?&gt;</returns>
-        Task<Order?> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order?> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -249,7 +249,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -266,7 +266,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -287,8 +287,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        protected virtual string? OnDeleteOrder(string? orderId)
+        protected virtual string OnDeleteOrder(string orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -297,7 +306,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="orderId"></param>
-        protected virtual void AfterDeleteOrder(ApiResponse<object?> apiResponse, string? orderId)
+        protected virtual void AfterDeleteOrder(ApiResponse<object?> apiResponse, string orderId)
         {
         }
 
@@ -308,7 +317,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="orderId"></param>
-        protected virtual void OnErrorDeleteOrder(Exception exception, string pathFormat, string path, string? orderId)
+        protected virtual void OnErrorDeleteOrder(Exception exception, string pathFormat, string path, string orderId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -320,7 +329,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -513,7 +522,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -530,7 +539,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order?> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order?> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?>? result = null;
             try 
@@ -551,8 +560,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        protected virtual long? OnGetOrderById(long? orderId)
+        protected virtual long OnGetOrderById(long orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -561,7 +579,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="orderId"></param>
-        protected virtual void AfterGetOrderById(ApiResponse<Order?> apiResponse, long? orderId)
+        protected virtual void AfterGetOrderById(ApiResponse<Order?> apiResponse, long orderId)
         {
         }
 
@@ -572,7 +590,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="orderId"></param>
-        protected virtual void OnErrorGetOrderById(Exception exception, string pathFormat, string path, long? orderId)
+        protected virtual void OnErrorGetOrderById(Exception exception, string pathFormat, string path, long orderId)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -584,7 +602,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order?>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -649,7 +667,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -666,7 +684,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order?> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order?> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order?>? result = null;
             try 
@@ -687,8 +705,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="order"></param>
         /// <returns></returns>
-        protected virtual Order? OnPlaceOrder(Order? order)
+        protected virtual Order OnPlaceOrder(Order order)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (order == null)
+                throw new ArgumentNullException(nameof(order));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return order;
         }
 
@@ -697,7 +724,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="order"></param>
-        protected virtual void AfterPlaceOrder(ApiResponse<Order?> apiResponse, Order? order)
+        protected virtual void AfterPlaceOrder(ApiResponse<Order?> apiResponse, Order order)
         {
         }
 
@@ -708,7 +735,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="order"></param>
-        protected virtual void OnErrorPlaceOrder(Exception exception, string pathFormat, string path, Order? order)
+        protected virtual void OnErrorPlaceOrder(Exception exception, string pathFormat, string path, Order order)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -720,7 +747,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order?>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
index 375f882d5a5..d6d3548d8aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs
@@ -39,7 +39,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -51,7 +51,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -74,7 +74,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -86,7 +86,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -132,7 +132,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -144,7 +144,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -156,7 +156,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -167,7 +167,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -179,7 +179,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User?&gt;&gt;</returns>
-        Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -191,7 +191,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -202,7 +202,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User?&gt;</returns>
-        Task<User?> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User?> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -215,7 +215,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string?&gt;&gt;</returns>
-        Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -228,7 +228,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -240,7 +240,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string?&gt;</returns>
-        Task<string?> LoginUserOrDefaultAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string?> LoginUserOrDefaultAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -281,11 +281,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object?&gt;&gt;</returns>
-        Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -294,11 +294,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -306,11 +306,11 @@ namespace Org.OpenAPITools.IApi
         /// <remarks>
         /// This can only be done by the logged in user.
         /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object?&gt;</returns>
-        Task<object?> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -395,7 +395,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -412,7 +412,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -433,8 +433,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual User? OnCreateUser(User? user)
+        protected virtual User OnCreateUser(User user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -443,7 +452,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUser(ApiResponse<object?> apiResponse, User? user)
+        protected virtual void AfterCreateUser(ApiResponse<object?> apiResponse, User user)
         {
         }
 
@@ -454,7 +463,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUser(Exception exception, string pathFormat, string path, User? user)
+        protected virtual void OnErrorCreateUser(Exception exception, string pathFormat, string path, User user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -466,7 +475,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -534,7 +543,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -551,7 +560,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -572,8 +581,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual List<User>? OnCreateUsersWithArrayInput(List<User>? user)
+        protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -582,7 +600,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUsersWithArrayInput(ApiResponse<object?> apiResponse, List<User>? user)
+        protected virtual void AfterCreateUsersWithArrayInput(ApiResponse<object?> apiResponse, List<User> user)
         {
         }
 
@@ -593,7 +611,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUsersWithArrayInput(Exception exception, string pathFormat, string path, List<User>? user)
+        protected virtual void OnErrorCreateUsersWithArrayInput(Exception exception, string pathFormat, string path, List<User> user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -605,7 +623,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -673,7 +691,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -690,7 +708,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -711,8 +729,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        protected virtual List<User>? OnCreateUsersWithListInput(List<User>? user)
+        protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -721,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="user"></param>
-        protected virtual void AfterCreateUsersWithListInput(ApiResponse<object?> apiResponse, List<User>? user)
+        protected virtual void AfterCreateUsersWithListInput(ApiResponse<object?> apiResponse, List<User> user)
         {
         }
 
@@ -732,7 +759,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorCreateUsersWithListInput(Exception exception, string pathFormat, string path, List<User>? user)
+        protected virtual void OnErrorCreateUsersWithListInput(Exception exception, string pathFormat, string path, List<User> user)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -744,7 +771,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -812,7 +839,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -829,7 +856,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
@@ -850,8 +877,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual string? OnDeleteUser(string? username)
+        protected virtual string OnDeleteUser(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -860,7 +896,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
-        protected virtual void AfterDeleteUser(ApiResponse<object?> apiResponse, string? username)
+        protected virtual void AfterDeleteUser(ApiResponse<object?> apiResponse, string username)
         {
         }
 
@@ -871,7 +907,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorDeleteUser(Exception exception, string pathFormat, string path, string? username)
+        protected virtual void OnErrorDeleteUser(Exception exception, string pathFormat, string path, string username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -883,7 +919,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -938,7 +974,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User?> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -955,7 +991,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User?> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User?> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User?>? result = null;
             try 
@@ -976,8 +1012,17 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual string? OnGetUserByName(string? username)
+        protected virtual string OnGetUserByName(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -986,7 +1031,7 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
-        protected virtual void AfterGetUserByName(ApiResponse<User?> apiResponse, string? username)
+        protected virtual void AfterGetUserByName(ApiResponse<User?> apiResponse, string username)
         {
         }
 
@@ -997,7 +1042,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="username"></param>
-        protected virtual void OnErrorGetUserByName(Exception exception, string pathFormat, string path, string? username)
+        protected virtual void OnErrorGetUserByName(Exception exception, string pathFormat, string path, string username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1009,7 +1054,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User?>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1075,7 +1120,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1093,7 +1138,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string?> LoginUserOrDefaultAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string?> LoginUserOrDefaultAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string?>? result = null;
             try 
@@ -1115,8 +1160,20 @@ namespace Org.OpenAPITools.Api
         /// <param name="username"></param>
         /// <param name="password"></param>
         /// <returns></returns>
-        protected virtual (string?, string?) OnLoginUser(string? username, string? password)
+        protected virtual (string, string) OnLoginUser(string username, string password)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            if (password == null)
+                throw new ArgumentNullException(nameof(password));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (username, password);
         }
 
@@ -1126,7 +1183,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="username"></param>
         /// <param name="password"></param>
-        protected virtual void AfterLoginUser(ApiResponse<string?> apiResponse, string? username, string? password)
+        protected virtual void AfterLoginUser(ApiResponse<string?> apiResponse, string username, string password)
         {
         }
 
@@ -1138,7 +1195,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="username"></param>
         /// <param name="password"></param>
-        protected virtual void OnErrorLoginUser(Exception exception, string pathFormat, string path, string? username, string? password)
+        protected virtual void OnErrorLoginUser(Exception exception, string pathFormat, string path, string username, string password)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1151,7 +1208,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string?>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1342,13 +1399,13 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object?> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object?> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1360,16 +1417,16 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object?> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object?>? result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1383,21 +1440,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="username"></param>
         /// <param name="user"></param>
+        /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual (string?, User?) OnUpdateUser(string? username, User? user)
+        protected virtual (User, string) OnUpdateUser(User user, string username)
         {
-            return (username, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, username);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object?> apiResponse, string? username, User? user)
+        /// <param name="username"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object?> apiResponse, User user, string username)
         {
         }
 
@@ -1407,9 +1476,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string? username, User? user)
+        /// <param name="username"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1418,19 +1487,19 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object?>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(username, user);
-                username = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(user, username);
+                user = validatedParameters.Item1;
+                username = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1471,7 +1540,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, username, user);
+                            AfterUpdateUser(apiResponse, user, username);
                         }
 
                         return apiResponse;
@@ -1480,7 +1549,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 03e3c65016d..2bdee7f21c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -33,16 +33,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapOfMapProperty">mapOfMapProperty</param>
-        /// <param name="anytype1">anytype1</param>
+        /// <param name="mapProperty">mapProperty</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
+        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object? anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
+        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object? anytype1 = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -71,21 +71,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapProperty = mapProperty;
+            EmptyMap = emptyMap;
             MapOfMapProperty = mapOfMapProperty;
-            Anytype1 = anytype1;
+            MapProperty = mapProperty;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
-            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
+            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -94,10 +95,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapProperty
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object? Anytype1 { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -117,19 +118,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_with_undeclared_properties_anytype_3")]
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
-        /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
-        /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
         [JsonPropertyName("map_with_undeclared_properties_string")]
         public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [JsonPropertyName("anytype_1")]
+        public Object? Anytype1 { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -144,14 +144,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -189,14 +189,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, string> mapProperty = default;
+            Object emptyMap = default;
             Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
-            Object anytype1 = default;
+            Dictionary<string, string> mapProperty = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
-            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
+            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -213,14 +213,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -231,19 +231,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
+            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
         }
 
         /// <summary>
@@ -257,22 +257,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_of_map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
+            writer.WritePropertyName("map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
index 6a903337499..9e9334983bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -34,10 +34,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="type">type</param>
         /// <param name="message">message</param>
+        /// <param name="type">type</param>
         [JsonConstructor]
-        public ApiResponse(int code, string type, string message)
+        public ApiResponse(int code, string message, string type)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Type = type;
             Message = message;
+            Type = type;
         }
 
         /// <summary>
@@ -65,18 +65,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Type
-        /// </summary>
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or Sets Message
         /// </summary>
         [JsonPropertyName("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -92,8 +92,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -132,8 +132,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string type = default;
             string message = default;
+            string type = default;
 
             while (reader.Read())
             {
@@ -153,19 +153,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "type":
-                            type = reader.GetString();
-                            break;
                         case "message":
                             message = reader.GetString();
                             break;
+                        case "type":
+                            type = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, type, message);
+            return new ApiResponse(code, message, type);
         }
 
         /// <summary>
@@ -180,8 +180,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("type", apiResponse.Type);
             writer.WriteString("message", apiResponse.Message);
+            writer.WriteString("type", apiResponse.Type);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
index 34598f70f3c..95286c8847a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
-        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
+        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
+        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,17 +54,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
+            ArrayOfString = arrayOfString;
         }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -77,6 +71,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
+            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
         }
 
         /// <summary>
@@ -179,12 +179,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
index 10fd0d010c7..7b2728c1e73 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -33,14 +33,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         /// <param name="capitalCamel">capitalCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         [JsonConstructor]
-        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
+        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -66,19 +66,20 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SmallCamel = smallCamel;
+            ATT_NAME = aTTNAME;
             CapitalCamel = capitalCamel;
-            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
+            SmallSnake = smallSnake;
         }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -86,12 +87,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SmallSnake
-        /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
-
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -105,11 +100,16 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -125,12 +125,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -168,12 +168,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string smallCamel = default;
+            string aTTNAME = default;
             string capitalCamel = default;
-            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string aTTNAME = default;
+            string smallCamel = default;
+            string smallSnake = default;
 
             while (reader.Read())
             {
@@ -190,23 +190,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
-                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
+                            break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
                             break;
                         default:
                             break;
@@ -214,7 +214,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
+            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
         }
 
         /// <summary>
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
index e22023c0877..1ed872ebd7f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         /// <param name="id">id</param>
+        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         [JsonConstructor]
-        public Category(string name = "default-name", long id)
+        public Category(long id, string name = "default-name")
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -50,22 +50,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Name = name;
             Id = id;
+            Name = name;
         }
 
-        /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [JsonPropertyName("id")]
         public long Id { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string name = default;
             long id = default;
+            string name = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
                         case "id":
                             id = reader.GetInt64();
                             break;
+                        case "name":
+                            name = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(name, id);
+            return new Category(id, name);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("name", category.Name);
             writer.WriteNumber("id", category.Id);
+            writer.WriteString("name", category.Name);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
index 1319b9dce38..1c5262054dc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="_class">_class</param>
+        /// <param name="classProperty">classProperty</param>
         [JsonConstructor]
-        public ClassModel(string _class)
+        public ClassModel(string classProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Class = _class;
+            ClassProperty = classProperty;
         }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets ClassProperty
         /// </summary>
         [JsonPropertyName("_class")]
-        public string Class { get; set; }
+        public string ClassProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _class = default;
+            string classProperty = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            _class = reader.GetString();
+                            classProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(_class);
+            return new ClassModel(classProperty);
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.Class);
+            writer.WriteString("_class", classModel.ClassProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
index d5cc7274af1..72a19246c84 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs
@@ -35,10 +35,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="nullableShape">nullableShape</param>
         /// <param name="shapes">shapes</param>
+        /// <param name="nullableShape">nullableShape</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape? nullableShape = default, List<Shape> shapes) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape? nullableShape = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            NullableShape = nullableShape;
             Shapes = shapes;
+            NullableShape = nullableShape;
         }
 
         /// <summary>
@@ -73,18 +73,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets NullableShape
-        /// </summary>
-        [JsonPropertyName("nullableShape")]
-        public NullableShape? NullableShape { get; set; }
-
         /// <summary>
         /// Gets or Sets Shapes
         /// </summary>
         [JsonPropertyName("shapes")]
         public List<Shape> Shapes { get; set; }
 
+        /// <summary>
+        /// Gets or Sets NullableShape
+        /// </summary>
+        [JsonPropertyName("nullableShape")]
+        public NullableShape? NullableShape { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -96,8 +96,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("  Shapes: ").Append(Shapes).Append("\n");
+            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -136,8 +136,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            NullableShape nullableShape = default;
             List<Shape> shapes = default;
+            NullableShape nullableShape = default;
 
             while (reader.Read())
             {
@@ -160,19 +160,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "nullableShape":
-                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
-                            break;
                         case "shapes":
                             shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
                             break;
+                        case "nullableShape":
+                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
+            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
         }
 
         /// <summary>
@@ -190,10 +190,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("nullableShape");
-            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
             writer.WritePropertyName("shapes");
             JsonSerializer.Serialize(writer, drawing.Shapes, options);
+            writer.WritePropertyName("nullableShape");
+            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
index a7a0dbec514..8040834df48 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
+        /// <param name="justSymbol">justSymbol</param>
         [JsonConstructor]
-        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
+        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -50,41 +50,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
+            JustSymbol = justSymbol;
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Defines ArrayEnum
         /// </summary>
-        public enum JustSymbolEnum
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -93,54 +93,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
-        /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -149,17 +143,23 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
+        /// <summary>
+        /// Gets or Sets JustSymbol
+        /// </summary>
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -180,8 +180,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
+            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -219,8 +219,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumArrays.JustSymbolEnum justSymbol = default;
             List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
+            EnumArrays.JustSymbolEnum justSymbol = default;
 
             while (reader.Read())
             {
@@ -237,20 +237,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(justSymbol, arrayEnum);
+            return new EnumArrays(arrayEnum, justSymbol);
         }
 
         /// <summary>
@@ -264,13 +264,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
index d71fc4232a0..e0b83aafe4d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -33,17 +33,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="outerEnum">outerEnum</param>
-        /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="enumString">enumString</param>
+        /// <param name="enumStringRequired">enumStringRequired</param>
         /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
+        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -75,56 +75,48 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EnumStringRequired = enumStringRequired;
-            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            OuterEnum = outerEnum;
-            OuterEnumInteger = outerEnumInteger;
+            EnumString = enumString;
+            EnumStringRequired = enumStringRequired;
             OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnumInteger = outerEnumInteger;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
+            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            Lower = 2,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -133,65 +125,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -200,57 +175,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            NUMBER_1 = 1,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -259,48 +225,62 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            return (int) value;
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
+
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -309,48 +289,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -359,28 +356,31 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
 
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -388,18 +388,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("outerEnumInteger")]
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
-        /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
-        /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
-
         /// <summary>
         /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
         [JsonPropertyName("outerEnumIntegerDefaultValue")]
         public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
+        /// <summary>
+        /// Gets or Sets OuterEnum
+        /// </summary>
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -414,15 +414,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
-            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
             sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -460,15 +460,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            OuterEnum? outerEnum = default;
-            OuterEnumInteger outerEnumInteger = default;
+            EnumTest.EnumStringEnum enumString = default;
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
             OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnumInteger outerEnumInteger = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
+            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -485,14 +485,6 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
-                            break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
-                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -502,29 +494,37 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
+            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
         }
 
         /// <summary>
@@ -538,41 +538,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
-            if (enumStringRequiredRawValue != null)
-                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
-            else
-                writer.WriteNull("enum_string_required");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
             var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
             if (enumStringRawValue != null)
                 writer.WriteString("enum_string", enumStringRawValue);
             else
                 writer.WriteNull("enum_string");
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
-            if (outerEnumIntegerRawValue != null)
-                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
+            if (enumStringRequiredRawValue != null)
+                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
-                writer.WriteNull("outerEnumInteger");
+                writer.WriteNull("enum_string_required");
             var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
+            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            if (outerEnumIntegerRawValue != null)
+                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            else
+                writer.WriteNull("outerEnumInteger");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index 68b38dc2b18..a78484e9493 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="_string">_string</param>
+        /// <param name="stringProperty">stringProperty</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo _string)
+        public FooGetDefaultResponse(Foo stringProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            String = _string;
+            StringProperty = stringProperty;
         }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets StringProperty
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo String { get; set; }
+        public Foo StringProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo _string = default;
+            Foo stringProperty = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(_string);
+            return new FooGetDefaultResponse(stringProperty);
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
index 617d1471741..56c91e4bf74 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -33,24 +33,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="number">number</param>
-        /// <param name="_byte">_byte</param>
+        /// <param name="binary">binary</param>
+        /// <param name="byteProperty">byteProperty</param>
         /// <param name="date">date</param>
-        /// <param name="password">password</param>
-        /// <param name="integer">integer</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="decimalProperty">decimalProperty</param>
+        /// <param name="doubleProperty">doubleProperty</param>
+        /// <param name="floatProperty">floatProperty</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="_float">_float</param>
-        /// <param name="_double">_double</param>
-        /// <param name="_decimal">_decimal</param>
-        /// <param name="_string">_string</param>
-        /// <param name="binary">binary</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="uuid">uuid</param>
+        /// <param name="integer">integer</param>
+        /// <param name="number">number</param>
+        /// <param name="password">password</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
+        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
+        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -67,20 +67,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (_float == null)
-                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
+            if (floatProperty == null)
+                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
 
-            if (_double == null)
-                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
+            if (doubleProperty == null)
+                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
 
-            if (_decimal == null)
-                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
+            if (decimalProperty == null)
+                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
 
-            if (_byte == null)
-                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
+            if (byteProperty == null)
+                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -106,35 +106,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Number = number;
-            Byte = _byte;
+            Binary = binary;
+            ByteProperty = byteProperty;
             Date = date;
-            Password = password;
-            Integer = integer;
+            DateTime = dateTime;
+            DecimalProperty = decimalProperty;
+            DoubleProperty = doubleProperty;
+            FloatProperty = floatProperty;
             Int32 = int32;
             Int64 = int64;
-            Float = _float;
-            Double = _double;
-            Decimal = _decimal;
-            String = _string;
-            Binary = binary;
-            DateTime = dateTime;
-            Uuid = uuid;
+            Integer = integer;
+            Number = number;
+            Password = password;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
+            StringProperty = stringProperty;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Binary
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets Byte
+        /// Gets or Sets ByteProperty
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] Byte { get; set; }
+        public byte[] ByteProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -143,70 +143,58 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets DecimalProperty
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Int32
-        /// </summary>
-        [JsonPropertyName("int32")]
-        public int Int32 { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal DecimalProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Int64
+        /// Gets or Sets DoubleProperty
         /// </summary>
-        [JsonPropertyName("int64")]
-        public long Int64 { get; set; }
+        [JsonPropertyName("double")]
+        public double DoubleProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Float
+        /// Gets or Sets FloatProperty
         /// </summary>
         [JsonPropertyName("float")]
-        public float Float { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Double
-        /// </summary>
-        [JsonPropertyName("double")]
-        public double Double { get; set; }
+        public float FloatProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Decimal
+        /// Gets or Sets Int32
         /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal Decimal { get; set; }
+        [JsonPropertyName("int32")]
+        public int Int32 { get; set; }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets Int64
         /// </summary>
-        [JsonPropertyName("string")]
-        public string String { get; set; }
+        [JsonPropertyName("int64")]
+        public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets Uuid
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
         /// A string that is a 10 digit number. Can have leading zeros.
@@ -222,6 +210,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("pattern_with_digits_and_delimiter")]
         public string PatternWithDigitsAndDelimiter { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProperty
+        /// </summary>
+        [JsonPropertyName("string")]
+        public string StringProperty { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -236,22 +236,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Byte: ").Append(Byte).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
+            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
+            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Float: ").Append(Float).Append("\n");
-            sb.Append("  Double: ").Append(Double).Append("\n");
-            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
-            sb.Append("  String: ").Append(String).Append("\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -263,40 +263,28 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
-            }
-
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // DoubleProperty (double) maximum
+            if (this.DoubleProperty > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
-            }
-
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
             }
 
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // DoubleProperty (double) minimum
+            if (this.DoubleProperty < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // FloatProperty (float) maximum
+            if (this.FloatProperty > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // FloatProperty (float) minimum
+            if (this.FloatProperty < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
             }
 
             // Int32 (int) maximum
@@ -311,35 +299,40 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Float (float) maximum
-            if (this.Float > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // Float (float) minimum
-            if (this.Float < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
-            // Double (double) maximum
-            if (this.Double > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
             }
 
-            // Double (double) minimum
-            if (this.Double < (double)67.8)
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
             }
 
-            // String (string) pattern
-            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexString.Match(this.String).Success)
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+            }
+
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
             // PatternWithDigits (string) pattern
@@ -356,6 +349,13 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
+            // StringProperty (string) pattern
+            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexStringProperty.Match(this.StringProperty).Success)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
+            }
+
             yield break;
         }
     }
@@ -382,22 +382,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            decimal number = default;
-            byte[] _byte = default;
+            System.IO.Stream binary = default;
+            byte[] byteProperty = default;
             DateTime date = default;
-            string password = default;
-            int integer = default;
+            DateTime dateTime = default;
+            decimal decimalProperty = default;
+            double doubleProperty = default;
+            float floatProperty = default;
             int int32 = default;
             long int64 = default;
-            float _float = default;
-            double _double = default;
-            decimal _decimal = default;
-            string _string = default;
-            System.IO.Stream binary = default;
-            DateTime dateTime = default;
-            Guid uuid = default;
+            int integer = default;
+            decimal number = default;
+            string password = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
+            string stringProperty = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -414,20 +414,26 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "number":
-                            number = reader.GetInt32();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
                         case "byte":
-                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "decimal":
+                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
+                            break;
+                        case "double":
+                            doubleProperty = reader.GetDouble();
+                            break;
+                        case "float":
+                            floatProperty = (float)reader.GetDouble();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -435,26 +441,14 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "float":
-                            _float = (float)reader.GetDouble();
-                            break;
-                        case "double":
-                            _double = reader.GetDouble();
-                            break;
-                        case "decimal":
-                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "string":
-                            _string = reader.GetString();
-                            break;
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
+                        case "password":
+                            password = reader.GetString();
                             break;
                         case "pattern_with_digits":
                             patternWithDigits = reader.GetString();
@@ -462,13 +456,19 @@ namespace Org.OpenAPITools.Model
                         case "pattern_with_digits_and_delimiter":
                             patternWithDigitsAndDelimiter = reader.GetString();
                             break;
+                        case "string":
+                            stringProperty = reader.GetString();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
+            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
         }
 
         /// <summary>
@@ -482,27 +482,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("number", formatTest.Number);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.Byte, options);
+            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WriteString("password", formatTest.Password);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("int32", formatTest.Int32);
-            writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("float", formatTest.Float);
-            writer.WriteNumber("double", formatTest.Double);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
-            writer.WriteString("string", formatTest.String);
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WriteString("uuid", formatTest.Uuid);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
+            writer.WriteNumber("double", formatTest.DoubleProperty);
+            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteNumber("int32", formatTest.Int32);
+            writer.WriteNumber("int64", formatTest.Int64);
+            writer.WriteNumber("integer", formatTest.Integer);
+            writer.WriteNumber("number", formatTest.Number);
+            writer.WriteString("password", formatTest.Password);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
+            writer.WriteString("string", formatTest.StringProperty);
+            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
index c3a0a5e83c1..750572e0098 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
@@ -33,12 +33,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="mapMapOfString">mapMapOfString</param>
-        /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
+        /// <param name="mapMapOfString">mapMapOfString</param>
+        /// <param name="mapOfEnumString">mapOfEnumString</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
+        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,10 +58,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapMapOfString = mapMapOfString;
-            MapOfEnumString = mapOfEnumString;
             DirectMap = directMap;
             IndirectMap = indirectMap;
+            MapMapOfString = mapMapOfString;
+            MapOfEnumString = mapOfEnumString;
         }
 
         /// <summary>
@@ -114,18 +114,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets MapMapOfString
-        /// </summary>
-        [JsonPropertyName("map_map_of_string")]
-        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -138,6 +126,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("indirect_map")]
         public Dictionary<string, bool> IndirectMap { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapMapOfString
+        /// </summary>
+        [JsonPropertyName("map_map_of_string")]
+        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -152,10 +152,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
-            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
             sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
+            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
+            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -193,10 +193,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
-            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
             Dictionary<string, bool> directMap = default;
             Dictionary<string, bool> indirectMap = default;
+            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
+            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
 
             while (reader.Read())
             {
@@ -213,25 +213,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_map_of_string":
-                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
-                            break;
-                        case "map_of_enum_string":
-                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
-                            break;
                         case "direct_map":
                             directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
                         case "indirect_map":
                             indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
+                        case "map_map_of_string":
+                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
+                            break;
+                        case "map_of_enum_string":
+                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
         }
 
         /// <summary>
@@ -245,14 +245,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_map_of_string");
-            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
-            writer.WritePropertyName("map_of_enum_string");
-            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
             writer.WritePropertyName("direct_map");
             JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
             writer.WritePropertyName("indirect_map");
             JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
+            writer.WritePropertyName("map_map_of_string");
+            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
+            writer.WritePropertyName("map_of_enum_string");
+            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 606c164d8a8..9086f808663 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
+        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,17 +54,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
+            Uuid = uuid;
         }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -77,6 +71,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
+            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
         }
 
         /// <summary>
@@ -179,11 +179,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
index d8597a9e082..4924f5c2037 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
+        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
-        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(int name, string _class)
+        public Model200Response(string classProperty, int name)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -44,27 +44,27 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ClassProperty = classProperty;
             Name = name;
-            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Gets or Sets ClassProperty
         /// </summary>
-        [JsonPropertyName("name")]
-        public int Name { get; set; }
+        [JsonPropertyName("class")]
+        public string ClassProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("class")]
-        public string Class { get; set; }
+        [JsonPropertyName("name")]
+        public int Name { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            string classProperty = default;
             int name = default;
-            string _class = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "class":
+                            classProperty = reader.GetString();
+                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
-                        case "class":
-                            _class = reader.GetString();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(name, _class);
+            return new Model200Response(classProperty, name);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
-            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
index 1b73d45c2ac..8dd430bc07d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -33,27 +33,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="_client">_client</param>
+        /// <param name="clientProperty">clientProperty</param>
         [JsonConstructor]
-        public ModelClient(string _client)
+        public ModelClient(string clientProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_client == null)
-                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
+            if (clientProperty == null)
+                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _Client = _client;
+            _ClientProperty = clientProperty;
         }
 
         /// <summary>
-        /// Gets or Sets _Client
+        /// Gets or Sets _ClientProperty
         /// </summary>
         [JsonPropertyName("client")]
-        public string _Client { get; set; }
+        public string _ClientProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -69,7 +69,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _Client: ").Append(_Client).Append("\n");
+            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _client = default;
+            string clientProperty = default;
 
             while (reader.Read())
             {
@@ -125,7 +125,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            _client = reader.GetString();
+                            clientProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(_client);
+            return new ModelClient(clientProperty);
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._Client);
+            writer.WriteString("client", modelClient._ClientProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
index d52ec15f9fc..c41e6281d6a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs
@@ -34,17 +34,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="snakeCase">snakeCase</param>
         /// <param name="property">property</param>
+        /// <param name="snakeCase">snakeCase</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, int snakeCase, string property, int _123number)
+        public Name(int nameProperty, string property, int snakeCase, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (name == null)
-                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
+            if (nameProperty == null)
+                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -59,8 +59,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            SnakeCase = snakeCase;
             Property = property;
+            SnakeCase = snakeCase;
             _123Number = _123number;
         }
 
@@ -70,18 +70,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SnakeCase
-        /// </summary>
-        [JsonPropertyName("snake_case")]
-        public int SnakeCase { get; }
-
         /// <summary>
         /// Gets or Sets Property
         /// </summary>
         [JsonPropertyName("property")]
         public string Property { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SnakeCase
+        /// </summary>
+        [JsonPropertyName("snake_case")]
+        public int SnakeCase { get; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -103,8 +103,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  Property: ").Append(Property).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -181,8 +181,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            int snakeCase = default;
             string property = default;
+            int snakeCase = default;
             int _123number = default;
 
             while (reader.Read())
@@ -203,12 +203,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "snake_case":
-                            snakeCase = reader.GetInt32();
-                            break;
                         case "property":
                             property = reader.GetString();
                             break;
+                        case "snake_case":
+                            snakeCase = reader.GetInt32();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -218,7 +218,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, snakeCase, property, _123number);
+            return new Name(nameProperty, property, snakeCase, _123number);
         }
 
         /// <summary>
@@ -233,8 +233,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteString("property", name.Property);
+            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
index ef267a31bd5..e5b8bdba0a9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -33,20 +33,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
         /// <param name="booleanProp">booleanProp</param>
-        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string? stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object>? arrayNullableProp = default, List<Object>? arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object>? objectNullableProp = default, Dictionary<string, Object>? objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
+        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object>? arrayAndItemsNullableProp = default, List<Object>? arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object>? objectAndItemsNullableProp = default, Dictionary<string, Object>? objectNullableProp = default, string? stringProp = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -60,43 +60,49 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
+            ArrayItemsNullable = arrayItemsNullable;
+            ObjectItemsNullable = objectItemsNullable;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
             BooleanProp = booleanProp;
-            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            ArrayNullableProp = arrayNullableProp;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectNullableProp = objectNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             ObjectAndItemsNullableProp = objectAndItemsNullableProp;
-            ObjectItemsNullable = objectItemsNullable;
+            ObjectNullableProp = objectNullableProp;
+            StringProp = stringProp;
         }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ObjectItemsNullable
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets BooleanProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("boolean_prop")]
-        public bool? BooleanProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object>? ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string? StringProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object>? ArrayNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BooleanProp
+        /// </summary>
+        [JsonPropertyName("boolean_prop")]
+        public bool? BooleanProp { get; set; }
 
         /// <summary>
         /// Gets or Sets DateProp
@@ -111,22 +117,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object>? ArrayNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object>? ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object>? ObjectAndItemsNullableProp { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -135,16 +141,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object>? ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
-        /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object>? ObjectAndItemsNullableProp { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
+        /// Gets or Sets StringProp
         /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
+        [JsonPropertyName("string_prop")]
+        public string? StringProp { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -155,18 +155,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -203,18 +203,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            int? integerProp = default;
-            decimal? numberProp = default;
+            List<Object> arrayItemsNullable = default;
+            Dictionary<string, Object> objectItemsNullable = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
             bool? booleanProp = default;
-            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            List<Object> arrayNullableProp = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             Dictionary<string, Object> objectAndItemsNullableProp = default;
-            Dictionary<string, Object> objectItemsNullable = default;
+            Dictionary<string, Object> objectNullableProp = default;
+            string stringProp = default;
 
             while (reader.Read())
             {
@@ -231,43 +231,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                            break;
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
-                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "string_prop":
+                            stringProp = reader.GetString();
                             break;
                         default:
                             break;
@@ -275,7 +275,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
+            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
         }
 
         /// <summary>
@@ -289,35 +289,35 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            if (nullableClass.IntegerProp != null)
-                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
-            else
-                writer.WriteNull("integer_prop");
-            if (nullableClass.NumberProp != null)
-                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
-            else
-                writer.WriteNull("number_prop");
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
             if (nullableClass.BooleanProp != null)
                 writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
             else
                 writer.WriteNull("boolean_prop");
-            writer.WriteString("string_prop", nullableClass.StringProp);
             writer.WritePropertyName("date_prop");
             JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
             writer.WritePropertyName("datetime_prop");
             JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            if (nullableClass.IntegerProp != null)
+                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
+            else
+                writer.WriteNull("integer_prop");
+            if (nullableClass.NumberProp != null)
+                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
+            else
+                writer.WriteNull("number_prop");
             writer.WritePropertyName("object_and_items_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("object_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            writer.WriteString("string_prop", nullableClass.StringProp);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index 26bf8a2072c..e4ff37c86d2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -33,12 +33,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
-        /// <param name="id">id</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
         /// <param name="bars">bars</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="id">id</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
+        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,24 +58,18 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
-            Id = id;
-            DeprecatedRef = deprecatedRef;
             Bars = bars;
+            DeprecatedRef = deprecatedRef;
+            Id = id;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -85,11 +79,17 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -105,10 +105,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
             sb.Append("  Bars: ").Append(Bars).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -146,10 +146,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string uuid = default;
-            decimal id = default;
-            DeprecatedObject deprecatedRef = default;
             List<string> bars = default;
+            DeprecatedObject deprecatedRef = default;
+            decimal id = default;
+            string uuid = default;
 
             while (reader.Read())
             {
@@ -166,17 +166,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetString();
-                            break;
-                        case "id":
-                            id = reader.GetInt32();
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "deprecatedRef":
                             deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
                             break;
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "id":
+                            id = reader.GetInt32();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         default:
                             break;
@@ -184,7 +184,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
+            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
         }
 
         /// <summary>
@@ -198,12 +198,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WritePropertyName("deprecatedRef");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
             writer.WritePropertyName("bars");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WritePropertyName("deprecatedRef");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
index c559dca9556..672203d0301 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -33,11 +33,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
+        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
-        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
+        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -54,11 +54,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
-            MyBoolean = myBoolean;
         }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -71,12 +77,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -91,9 +91,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -131,9 +131,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
-            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -150,22 +150,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myNumber, myString, myBoolean);
+            return new OuterComposite(myBoolean, myNumber, myString);
         }
 
         /// <summary>
@@ -179,9 +179,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
index 3c792695fed..a5379280cc1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs
@@ -33,14 +33,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
+        /// <param name="category">category</param>
+        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="id">id</param>
-        /// <param name="category">category</param>
-        /// <param name="tags">tags</param>
         /// <param name="status">pet status in the store</param>
+        /// <param name="tags">tags</param>
         [JsonConstructor]
-        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
+        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -66,12 +66,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Category = category;
+            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Id = id;
-            Category = category;
-            Tags = tags;
             Status = status;
+            Tags = tags;
         }
 
         /// <summary>
@@ -144,16 +144,10 @@ namespace Org.OpenAPITools.Model
         public StatusEnum Status { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or Sets PhotoUrls
+        /// Gets or Sets Category
         /// </summary>
-        [JsonPropertyName("photoUrls")]
-        public List<string> PhotoUrls { get; set; }
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
 
         /// <summary>
         /// Gets or Sets Id
@@ -162,10 +156,16 @@ namespace Org.OpenAPITools.Model
         public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets Category
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        [JsonPropertyName("photoUrls")]
+        public List<string> PhotoUrls { get; set; }
 
         /// <summary>
         /// Gets or Sets Tags
@@ -187,12 +187,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -230,12 +230,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Category category = default;
+            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            long id = default;
-            Category category = default;
-            List<Tag> tags = default;
             Pet.StatusEnum status = default;
+            List<Tag> tags = default;
 
             while (reader.Read())
             {
@@ -252,32 +252,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
-                        case "photoUrls":
-                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "id":
                             id = reader.GetInt64();
                             break;
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
+                        case "name":
+                            name = reader.GetString();
                             break;
-                        case "tags":
-                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                        case "photoUrls":
+                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "status":
                             string statusRawValue = reader.GetString();
                             status = Pet.StatusEnumFromString(statusRawValue);
                             break;
+                        case "tags":
+                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(name, photoUrls, id, category, tags, status);
+            return new Pet(category, id, name, photoUrls, status, tags);
         }
 
         /// <summary>
@@ -291,19 +291,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
-            writer.WriteNumber("id", pet.Id);
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
index c614408c264..9f793b0844b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs
@@ -40,8 +40,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_return == null)
-                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
+            if (returnProperty == null)
+                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
index f1be2a2e9f3..cd2254f128b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialPropertyName">specialPropertyName</param>
         /// <param name="specialModelNameProperty">specialModelNameProperty</param>
+        /// <param name="specialPropertyName">specialPropertyName</param>
         [JsonConstructor]
-        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
+        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -44,28 +44,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelName == null)
-                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
+            if (specialModelNameProperty == null)
+                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialPropertyName = specialPropertyName;
             SpecialModelNameProperty = specialModelNameProperty;
+            SpecialPropertyName = specialPropertyName;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialPropertyName
-        /// </summary>
-        [JsonPropertyName("$special[property.name]")]
-        public long SpecialPropertyName { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialModelNameProperty
         /// </summary>
         [JsonPropertyName("_special_model.name_")]
         public string SpecialModelNameProperty { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialPropertyName
+        /// </summary>
+        [JsonPropertyName("$special[property.name]")]
+        public long SpecialPropertyName { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -80,8 +80,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
+            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -119,8 +119,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long specialPropertyName = default;
             string specialModelNameProperty = default;
+            long specialPropertyName = default;
 
             while (reader.Read())
             {
@@ -137,19 +137,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "$special[property.name]":
-                            specialPropertyName = reader.GetInt64();
-                            break;
                         case "_special_model.name_":
                             specialModelNameProperty = reader.GetString();
                             break;
+                        case "$special[property.name]":
+                            specialPropertyName = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
+            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
         }
 
         /// <summary>
@@ -163,8 +163,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
             writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
+            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
index 410dadef11a..1e6f4005eb0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs
@@ -33,20 +33,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="id">id</param>
-        /// <param name="username">username</param>
+        /// <param name="email">email</param>
         /// <param name="firstName">firstName</param>
+        /// <param name="id">id</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="email">email</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
+        /// <param name="username">username</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object? objectWithNoDeclaredPropsNullable = default, Object? anyTypeProp = default, Object? anyTypePropNullable = default)
+        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object? anyTypeProp = default, Object? anyTypePropNullable = default, Object? objectWithNoDeclaredPropsNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -81,31 +81,25 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
-            Username = username;
+            Email = email;
             FirstName = firstName;
+            Id = id;
             LastName = lastName;
-            Email = email;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
+            Username = username;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Username
+        /// Gets or Sets Email
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets FirstName
@@ -113,6 +107,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("firstName")]
         public string FirstName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
@@ -120,10 +120,11 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -145,18 +146,10 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
-
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// Gets or Sets Username
         /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object? ObjectWithNoDeclaredPropsNullable { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -172,6 +165,13 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object? AnyTypePropNullable { get; set; }
 
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object? ObjectWithNoDeclaredPropsNullable { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -186,18 +186,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -235,18 +235,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
-            string username = default;
+            string email = default;
             string firstName = default;
+            long id = default;
             string lastName = default;
-            string email = default;
+            Object objectWithNoDeclaredProps = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            Object objectWithNoDeclaredProps = default;
-            Object objectWithNoDeclaredPropsNullable = default;
+            string username = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
+            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -263,20 +263,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
-                        case "username":
-                            username = reader.GetString();
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "email":
-                            email = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "password":
                             password = reader.GetString();
@@ -287,11 +287,8 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -299,13 +296,16 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
+            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
         }
 
         /// <summary>
@@ -319,22 +319,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", user.Id);
-            writer.WriteString("username", user.Username);
+            writer.WriteString("email", user.Email);
             writer.WriteString("firstName", user.FirstName);
+            writer.WriteNumber("id", user.Id);
             writer.WriteString("lastName", user.LastName);
-            writer.WriteString("email", user.Email);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
+            writer.WriteString("username", user.Username);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
index cf0f5c871be..65d841c450c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
@@ -92,31 +92,38 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
-src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
-src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
+src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -197,3 +204,4 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
index 2edcfc0a3d2..f9c1c7f7462 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md
@@ -1,277 +1 @@
-# Org.OpenAPITools - the C# library for the OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 1.0.0
-- SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
-
-<a name="frameworks-supported"></a>
-## Frameworks supported
-
-<a name="dependencies"></a>
-## Dependencies
-
-- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
-- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
-- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
-- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
-
-The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-Install-Package Newtonsoft.Json
-Install-Package JsonSubTypes
-Install-Package System.ComponentModel.Annotations
-Install-Package CompareNETObjects
-```
-<a name="installation"></a>
-## Installation
-Run the following command to generate the DLL
-- [Mac/Linux] `/bin/sh build.sh`
-- [Windows] `build.bat`
-
-Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
-```csharp
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-```
-<a name="packaging"></a>
-## Packaging
-
-A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
-
-This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
-
-```
-nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
-```
-
-Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
-
-<a name="usage"></a>
-## Usage
-
-To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
-```csharp
-Configuration c = new Configuration();
-System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
-webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
-c.Proxy = webProxy;
-```
-
-<a name="getting-started"></a>
-## Getting Started
-
-```csharp
-using System.Collections.Generic;
-using System.Diagnostics;
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-
-namespace Example
-{
-    public class Example
-    {
-        public static void Main()
-        {
-
-            Configuration config = new Configuration();
-            config.BasePath = "http://petstore.swagger.io:80/v2";
-            var apiInstance = new AnotherFakeApi(config);
-            var modelClient = new ModelClient(); // ModelClient | client model
-
-            try
-            {
-                // To test special tags
-                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
-                Debug.WriteLine(result);
-            }
-            catch (ApiException e)
-            {
-                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
-                Debug.Print("Status Code: "+ e.ErrorCode);
-                Debug.Print(e.StackTrace);
-            }
-
-        }
-    }
-}
-```
-
-<a name="documentation-for-api-endpoints"></a>
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
-*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
-*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
-
-
-<a name="documentation-for-models"></a>
-## Documentation for Models
-
- - [Model.Activity](docs//modelsActivity.md)
- - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
- - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
- - [Model.Animal](docs//modelsAnimal.md)
- - [Model.ApiResponse](docs//modelsApiResponse.md)
- - [Model.Apple](docs//modelsApple.md)
- - [Model.AppleReq](docs//modelsAppleReq.md)
- - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
- - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
- - [Model.ArrayTest](docs//modelsArrayTest.md)
- - [Model.Banana](docs//modelsBanana.md)
- - [Model.BananaReq](docs//modelsBananaReq.md)
- - [Model.BasquePig](docs//modelsBasquePig.md)
- - [Model.Capitalization](docs//modelsCapitalization.md)
- - [Model.Cat](docs//modelsCat.md)
- - [Model.CatAllOf](docs//modelsCatAllOf.md)
- - [Model.Category](docs//modelsCategory.md)
- - [Model.ChildCat](docs//modelsChildCat.md)
- - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
- - [Model.ClassModel](docs//modelsClassModel.md)
- - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
- - [Model.DanishPig](docs//modelsDanishPig.md)
- - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
- - [Model.Dog](docs//modelsDog.md)
- - [Model.DogAllOf](docs//modelsDogAllOf.md)
- - [Model.Drawing](docs//modelsDrawing.md)
- - [Model.EnumArrays](docs//modelsEnumArrays.md)
- - [Model.EnumClass](docs//modelsEnumClass.md)
- - [Model.EnumTest](docs//modelsEnumTest.md)
- - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
- - [Model.File](docs//modelsFile.md)
- - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
- - [Model.Foo](docs//modelsFoo.md)
- - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
- - [Model.FormatTest](docs//modelsFormatTest.md)
- - [Model.Fruit](docs//modelsFruit.md)
- - [Model.FruitReq](docs//modelsFruitReq.md)
- - [Model.GmFruit](docs//modelsGmFruit.md)
- - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
- - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
- - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
- - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
- - [Model.List](docs//modelsList.md)
- - [Model.Mammal](docs//modelsMammal.md)
- - [Model.MapTest](docs//modelsMapTest.md)
- - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model.Model200Response](docs//modelsModel200Response.md)
- - [Model.ModelClient](docs//modelsModelClient.md)
- - [Model.Name](docs//modelsName.md)
- - [Model.NullableClass](docs//modelsNullableClass.md)
- - [Model.NullableShape](docs//modelsNullableShape.md)
- - [Model.NumberOnly](docs//modelsNumberOnly.md)
- - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
- - [Model.Order](docs//modelsOrder.md)
- - [Model.OuterComposite](docs//modelsOuterComposite.md)
- - [Model.OuterEnum](docs//modelsOuterEnum.md)
- - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
- - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
- - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
- - [Model.ParentPet](docs//modelsParentPet.md)
- - [Model.Pet](docs//modelsPet.md)
- - [Model.Pig](docs//modelsPig.md)
- - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
- - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
- - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
- - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
- - [Model.Return](docs//modelsReturn.md)
- - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
- - [Model.Shape](docs//modelsShape.md)
- - [Model.ShapeInterface](docs//modelsShapeInterface.md)
- - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
- - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
- - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
- - [Model.Tag](docs//modelsTag.md)
- - [Model.Triangle](docs//modelsTriangle.md)
- - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
- - [Model.User](docs//modelsUser.md)
- - [Model.Whale](docs//modelsWhale.md)
- - [Model.Zebra](docs//modelsZebra.md)
-
-
-<a name="documentation-for-authorization"></a>
-## Documentation for Authorization
-
-<a name="api_key"></a>
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-<a name="api_key_query"></a>
-### api_key_query
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-<a name="bearer_test"></a>
-### bearer_test
-
-- **Type**: Bearer Authentication
-
-<a name="http_basic_test"></a>
-### http_basic_test
-
-- **Type**: HTTP basic authentication
-
-<a name="http_signature_test"></a>
-### http_signature_test
-
-
-<a name="petstore_auth"></a>
-### petstore_auth
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-
+# Created with Openapi Generator
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
index f17e38282a0..b815f20b5a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (string query, User user)
+> void TestBodyWithQueryParams (User user, string query)
 
 
 
@@ -652,12 +652,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var query = "query_example";  // string | 
             var user = new User(); // User | 
+            var query = "query_example";  // string | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(query, user);
+                apiInstance.TestBodyWithQueryParams(user, query);
             }
             catch (ApiException  e)
             {
@@ -676,7 +676,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
 }
 catch (ApiException e)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **query** | **string** |  |  |
 | **user** | [**User**](User.md) |  |  |
+| **query** | **string** |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, string password = null, string callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
+            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | 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 _float = 3.4F;  // float? | None (optional) 
             var integer = 56;  // int? | None (optional) 
             var int32 = 56;  // int? | None (optional) 
             var int64 = 789L;  // long? | None (optional) 
-            var _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
+| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **_byte** | **byte[]** | None |  |
+| **date** | **DateTime?** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
 | **_string** | **string** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null)
+> 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)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
             var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
+            var enumQueryInteger = 1;  // int? | 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 enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
+| **enumQueryInteger** | **int?** | 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] |
-| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
+> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1053,17 +1053,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
+            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var booleanGroup = true;  // bool? | Boolean in group parameters (optional) 
+            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var int64Group = 789L;  // long? | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1083,7 +1083,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1097,11 +1097,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
+| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **booleanGroup** | **bool?** | Boolean in group parameters | [optional]  |
+| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **int64Group** | **long?** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
index 8ece47af9ca..da6486e4cdc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
+> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
 
 uploads an image
 
@@ -689,13 +689,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            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) 
+            var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
+                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -716,7 +716,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -734,8 +734,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 | **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
+| **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -784,14 +784,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            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 petId = 789L;  // long | ID of pet to update
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -812,7 +812,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -829,8 +829,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **petId** | **long** | ID of pet to update |  |
 | **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
+| **petId** | **long** | ID of pet to update |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
index fd1c1a7d62b..a862c8c112a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (string username, User user)
+> void UpdateUser (User user, string username)
 
 Updated user
 
@@ -646,13 +646,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var username = "username_example";  // string | name that need to be deleted
             var user = new User(); // User | Updated user object
+            var username = "username_example";  // string | name that need to be deleted
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(username, user);
+                apiInstance.UpdateUser(user, username);
             }
             catch (ApiException  e)
             {
@@ -672,7 +672,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(username, user);
+    apiInstance.UpdateUserWithHttpInfo(user, username);
 }
 catch (ApiException e)
 {
@@ -686,8 +686,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **username** | **string** | name that need to be deleted |  |
 | **user** | [**User**](User.md) | Updated user object |  |
+| **username** | **string** | name that need to be deleted |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
index 1f919450009..f79869f95a7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [optional] 
+**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
index bc808ceeae3..d89ed1a25dc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Type** | **string** |  | [optional] 
 **Message** | **string** |  | [optional] 
+**Type** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
index 32365e6d4d0..ed572120cd6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
+**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
index fde98a967ef..9e225c17232 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SmallCamel** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
+**SmallSnake** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
index c2cf3f8e919..6eb0a2e13ea 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [default to "default-name"]
 **Id** | **long** |  | [optional] 
+**Name** | **string** |  | [default to "default-name"]
 
 [[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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
index bb35816c914..a098828a04f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Class** | **string** |  | [optional] 
+**ClassProperty** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
index 18117e6c938..fcee9662afb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
 **Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
+**NullableShape** | [**NullableShape**](NullableShape.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-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
index 2a27962cc52..7467f67978c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | **string** |  | [optional] 
 **ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
+**JustSymbol** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
index 71602270bab..53bbfe31e77 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **string** |  | 
-**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [optional] 
-**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**EnumString** | **string** |  | [optional] 
+**EnumStringRequired** | **string** |  | 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
index 47e50daca3e..78c99facf59 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**String** | [**Foo**](Foo.md) |  | [optional] 
+**StringProperty** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
index 0b92c2fb10a..4e34a6d18b3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Number** | **decimal** |  | 
-**Byte** | **byte[]** |  | 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**ByteProperty** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**Password** | **string** |  | 
-**Integer** | **int** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**DecimalProperty** | **decimal** |  | [optional] 
+**DoubleProperty** | **double** |  | [optional] 
+**FloatProperty** | **float** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Float** | **float** |  | [optional] 
-**Double** | **double** |  | [optional] 
-**Decimal** | **decimal** |  | [optional] 
-**String** | **string** |  | [optional] 
-**Binary** | **System.IO.Stream** |  | [optional] 
-**DateTime** | **DateTime** |  | [optional] 
-**Uuid** | **Guid** |  | [optional] 
+**Integer** | **int** |  | [optional] 
+**Number** | **decimal** |  | 
+**Password** | **string** |  | 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
+**StringProperty** | **string** |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
index aaee09f7870..5dd27228bb0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 031d2b96065..0bac85a8e83 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
index 8bc8049f46f..93139e1d1aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
-**Class** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
index 9e0e83645f3..51cf0636e72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_Client** | **string** |  | [optional] 
+**_ClientProperty** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
index 2ee782c0c54..11f49b9fd40 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**SnakeCase** | **int** |  | [optional] [readonly] 
 **Property** | **string** |  | [optional] 
+**SnakeCase** | **int** |  | [optional] [readonly] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
index d4a19d1856b..ac86336ea70 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**StringProp** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
index b737f7d757a..9f44c24d19a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **string** |  | [optional] 
-**Id** | **decimal** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
 **Bars** | **List&lt;string&gt;** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**Uuid** | **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-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
index abf676810fb..8985c59d094 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
-**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
index 7de10304abf..b13bb576b45 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Category** | [**Category**](Category.md) |  | [optional] 
+**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Id** | **long** |  | [optional] 
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
 **Status** | **string** | pet status in the store | [optional] 
+**Tags** | [**List&lt;Tag&gt;**](Tag.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-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
index 662fa6f4a38..b48f3490005 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialPropertyName** | **long** |  | [optional] 
 **SpecialModelNameProperty** | **string** |  | [optional] 
+**SpecialPropertyName** | **long** |  | [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-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
index a0f0d223899..455f031674d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
-**Username** | **string** |  | [optional] 
+**Email** | **string** |  | [optional] 
 **FirstName** | **string** |  | [optional] 
+**Id** | **long** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**Email** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
+**Username** | **string** |  | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index a166f64a394..7bca5fd0e17 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,6 +174,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -205,7 +214,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 21230c61955..0c0b289c532 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -59,7 +59,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool&gt;&gt;</returns>
-        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal&gt;&gt;</returns>
-        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -177,7 +177,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -189,7 +189,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -198,11 +198,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -211,11 +211,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -227,7 +227,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -239,7 +239,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -248,23 +248,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -273,23 +273,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -300,15 +300,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -319,15 +319,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -336,15 +336,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -353,15 +353,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -373,7 +373,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -385,7 +385,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -398,7 +398,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -411,7 +411,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -427,7 +427,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -657,7 +657,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -707,7 +707,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -932,7 +932,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -982,7 +982,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1315,7 +1315,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1332,7 +1332,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1355,6 +1355,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (fileSchemaTestClass == null)
+                throw new ArgumentNullException(nameof(fileSchemaTestClass));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return fileSchemaTestClass;
         }
 
@@ -1386,7 +1395,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1451,13 +1460,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1469,16 +1478,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1492,21 +1501,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        protected virtual (string, User) OnTestBodyWithQueryParams(string query, User user)
+        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
         {
-            return (query, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (query == null)
+                throw new ArgumentNullException(nameof(query));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, query);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, string query, User user)
+        /// <param name="query"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, User user, string query)
         {
         }
 
@@ -1516,9 +1537,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string query, User user)
+        /// <param name="query"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1527,19 +1548,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(query, user);
-                query = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(user, query);
+                user = validatedParameters.Item1;
+                query = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1586,7 +1607,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, query, user);
+                            AfterTestBodyWithQueryParams(apiResponse, user, query);
                         }
 
                         return apiResponse;
@@ -1595,7 +1616,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
                 throw;
             }
         }
@@ -1607,7 +1628,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1624,7 +1645,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -1647,6 +1668,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -1678,7 +1708,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1752,25 +1782,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1782,28 +1812,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1817,45 +1847,63 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (decimal, double, string, byte[], int?, int?, long?, float?, string, System.IO.Stream, DateTime?, string, string, DateTime?) OnTestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream, float?, int?, int?, long?, string, string, string, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
-            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (_byte == null)
+                throw new ArgumentNullException(nameof(_byte));
+
+            if (number == null)
+                throw new ArgumentNullException(nameof(number));
+
+            if (_double == null)
+                throw new ArgumentNullException(nameof(_double));
+
+            if (patternWithoutDelimiter == null)
+                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
         }
 
@@ -1865,21 +1913,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1888,40 +1936,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
-                number = validatedParameters.Item1;
-                _double = validatedParameters.Item2;
-                patternWithoutDelimiter = validatedParameters.Item3;
-                _byte = validatedParameters.Item4;
-                integer = validatedParameters.Item5;
-                int32 = validatedParameters.Item6;
-                int64 = validatedParameters.Item7;
-                _float = validatedParameters.Item8;
-                _string = validatedParameters.Item9;
-                binary = validatedParameters.Item10;
-                date = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                _byte = validatedParameters.Item1;
+                number = validatedParameters.Item2;
+                _double = validatedParameters.Item3;
+                patternWithoutDelimiter = validatedParameters.Item4;
+                date = validatedParameters.Item5;
+                binary = validatedParameters.Item6;
+                _float = validatedParameters.Item7;
+                integer = validatedParameters.Item8;
+                int32 = validatedParameters.Item9;
+                int64 = validatedParameters.Item10;
+                _string = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -1941,6 +1989,10 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
+                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
+
+
+
                     formParams.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -1951,9 +2003,14 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
 
-                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer)));
@@ -1964,18 +2021,9 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64)));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
-
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(_string)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
-
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
-
                     if (password != null)
                         formParams.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password)));
 
@@ -2021,7 +2069,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2033,7 +2081,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                 throw;
             }
         }
@@ -2044,17 +2092,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2068,20 +2116,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2097,16 +2145,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>, List<string>, int?, double?, string, string, List<string>, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual (List<string>, List<string>, double?, int?, List<string>, string, string, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
         }
 
         /// <summary>
@@ -2115,13 +2163,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
         }
 
@@ -2133,13 +2181,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2150,28 +2198,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryInteger = validatedParameters.Item3;
-                enumQueryDouble = validatedParameters.Item4;
-                enumHeaderString = validatedParameters.Item5;
-                enumQueryString = validatedParameters.Item6;
-                enumFormStringArray = validatedParameters.Item7;
+                enumQueryDouble = validatedParameters.Item3;
+                enumQueryInteger = validatedParameters.Item4;
+                enumFormStringArray = validatedParameters.Item5;
+                enumHeaderString = validatedParameters.Item6;
+                enumQueryString = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2185,12 +2233,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString());
 
-                    if (enumQueryInteger != null)
-                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
-
                     if (enumQueryDouble != null)
                         parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
 
+                    if (enumQueryInteger != null)
+                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString());
 
@@ -2242,7 +2290,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                         }
 
                         return apiResponse;
@@ -2251,7 +2299,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 throw;
             }
         }
@@ -2260,17 +2308,17 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2282,20 +2330,20 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2309,29 +2357,44 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
         /// <returns></returns>
-        protected virtual (int, bool, long, int?, bool?, long?) OnTestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
-            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredBooleanGroup == null)
+                throw new ArgumentNullException(nameof(requiredBooleanGroup));
+
+            if (requiredStringGroup == null)
+                throw new ArgumentNullException(nameof(requiredStringGroup));
+
+            if (requiredInt64Group == null)
+                throw new ArgumentNullException(nameof(requiredInt64Group));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
         }
 
@@ -2341,13 +2404,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2356,26 +2419,26 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-                requiredStringGroup = validatedParameters.Item1;
-                requiredBooleanGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                requiredBooleanGroup = validatedParameters.Item1;
+                requiredStringGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                stringGroup = validatedParameters.Item4;
-                booleanGroup = validatedParameters.Item5;
+                booleanGroup = validatedParameters.Item4;
+                stringGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2430,7 +2493,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2442,7 +2505,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                 throw;
             }
         }
@@ -2454,7 +2517,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2471,7 +2534,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2494,6 +2557,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requestBody == null)
+                throw new ArgumentNullException(nameof(requestBody));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return requestBody;
         }
 
@@ -2525,7 +2597,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2594,7 +2666,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2612,7 +2684,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2636,6 +2708,18 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnTestJsonFormData(string param, string param2)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (param == null)
+                throw new ArgumentNullException(nameof(param));
+
+            if (param2 == null)
+                throw new ArgumentNullException(nameof(param2));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (param, param2);
         }
 
@@ -2670,7 +2754,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2754,7 +2838,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -2775,7 +2859,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2802,6 +2886,27 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pipe == null)
+                throw new ArgumentNullException(nameof(pipe));
+
+            if (ioutil == null)
+                throw new ArgumentNullException(nameof(ioutil));
+
+            if (http == null)
+                throw new ArgumentNullException(nameof(http));
+
+            if (url == null)
+                throw new ArgumentNullException(nameof(url));
+
+            if (context == null)
+                throw new ArgumentNullException(nameof(context));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (pipe, ioutil, http, url, context);
         }
 
@@ -2845,7 +2950,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 7a54b0384f5..07d8973b740 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,6 +174,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClassname(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -205,7 +214,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
index 2eb7ffbf0fe..33b932d41a8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -87,7 +87,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -99,7 +99,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -111,7 +111,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet&gt;&gt;</returns>
-        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -185,7 +185,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -209,11 +209,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -250,12 +250,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -340,7 +340,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -357,7 +357,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -380,6 +380,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnAddPet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -411,7 +420,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -503,7 +512,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -521,7 +530,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -545,6 +554,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string) OnDeletePet(long petId, string apiKey)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, apiKey);
         }
 
@@ -579,7 +597,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -650,7 +668,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -667,7 +685,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -690,6 +708,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByStatus(List<string> status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (status == null)
+                throw new ArgumentNullException(nameof(status));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return status;
         }
 
@@ -721,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -814,7 +841,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -831,7 +858,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -854,6 +881,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByTags(List<string> tags)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (tags == null)
+                throw new ArgumentNullException(nameof(tags));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return tags;
         }
 
@@ -885,7 +921,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -978,7 +1014,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -995,7 +1031,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = null;
             try 
@@ -1018,6 +1054,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetPetById(long petId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return petId;
         }
 
@@ -1049,7 +1094,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1123,7 +1168,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1140,7 +1185,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1163,6 +1208,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnUpdatePet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -1194,7 +1248,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1287,7 +1341,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1306,7 +1360,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1331,6 +1385,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string, string) OnUpdatePetWithForm(long petId, string name, string status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, name, status);
         }
 
@@ -1368,7 +1431,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1456,13 +1519,13 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1475,16 +1538,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1499,12 +1562,21 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
+        /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long, string, System.IO.Stream) OnUploadFile(long petId, string additionalMetadata, System.IO.Stream file)
+        protected virtual (long, System.IO.Stream, string) OnUploadFile(long petId, System.IO.Stream file, string additionalMetadata)
         {
-            return (petId, additionalMetadata, file);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (petId, file, additionalMetadata);
         }
 
         /// <summary>
@@ -1512,9 +1584,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, string additionalMetadata, System.IO.Stream file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream file, string additionalMetadata)
         {
         }
 
@@ -1525,9 +1597,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, string additionalMetadata, System.IO.Stream file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream file, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1537,20 +1609,20 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
+                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
                 petId = validatedParameters.Item1;
-                additionalMetadata = validatedParameters.Item2;
-                file = validatedParameters.Item3;
+                file = validatedParameters.Item2;
+                additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1565,12 +1637,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string, string>> formParams = new List<KeyValuePair<string, string>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
-                        formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
-
-                    if (file != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
                         multipartContent.Add(new StreamContent(file));
 
+                    if (additionalMetadata != null)
+                        formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1616,7 +1688,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
+                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1628,7 +1700,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
                 throw;
             }
         }
@@ -1637,14 +1709,14 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1656,17 +1728,17 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1680,23 +1752,35 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long, System.IO.Stream, string) OnUploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual (System.IO.Stream, long, string) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
-            return (petId, requiredFile, additionalMetadata);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredFile == null)
+                throw new ArgumentNullException(nameof(requiredFile));
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredFile, petId, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
         }
 
@@ -1706,10 +1790,10 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1718,20 +1802,20 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-                petId = validatedParameters.Item1;
-                requiredFile = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                requiredFile = validatedParameters.Item1;
+                petId = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1798,7 +1882,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1810,7 +1894,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
index 3ed6709ec52..168268cb800 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -95,7 +95,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -204,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -221,7 +221,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -244,6 +244,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteOrder(string orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -275,7 +284,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -448,7 +457,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -465,7 +474,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -488,6 +497,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetOrderById(long orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -519,7 +537,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -584,7 +602,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -601,7 +619,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -624,6 +642,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Order OnPlaceOrder(Order order)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (order == null)
+                throw new ArgumentNullException(nameof(order));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return order;
         }
 
@@ -655,7 +682,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
index fcb08604e0f..541b8c83155 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -73,7 +73,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -85,7 +85,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User&gt;&gt;</returns>
-        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -158,7 +158,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string&gt;&gt;</returns>
-        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -202,11 +202,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -215,11 +215,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -304,7 +304,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -321,7 +321,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -344,6 +344,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual User OnCreateUser(User user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -375,7 +384,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -443,7 +452,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -460,7 +469,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -483,6 +492,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -514,7 +532,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -582,7 +600,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -599,7 +617,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -622,6 +640,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -653,7 +680,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -721,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -738,7 +765,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -761,6 +788,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteUser(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -792,7 +828,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -847,7 +883,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -864,7 +900,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = null;
             try 
@@ -887,6 +923,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnGetUserByName(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -918,7 +963,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -984,7 +1029,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1004,6 +1049,18 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnLoginUser(string username, string password)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            if (password == null)
+                throw new ArgumentNullException(nameof(password));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (username, password);
         }
 
@@ -1038,7 +1095,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1229,13 +1286,13 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1247,16 +1304,16 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1270,21 +1327,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="username"></param>
         /// <param name="user"></param>
+        /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual (string, User) OnUpdateUser(string username, User user)
+        protected virtual (User, string) OnUpdateUser(User user, string username)
         {
-            return (username, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, username);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, string username, User user)
+        /// <param name="username"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, User user, string username)
         {
         }
 
@@ -1294,9 +1363,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string username, User user)
+        /// <param name="username"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1305,19 +1374,19 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(username, user);
-                username = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(user, username);
+                user = validatedParameters.Item1;
+                username = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1358,7 +1427,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, username, user);
+                            AfterUpdateUser(apiResponse, user, username);
                         }
 
                         return apiResponse;
@@ -1367,7 +1436,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 267679a9928..5682c09e840 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -31,16 +31,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapOfMapProperty">mapOfMapProperty</param>
-        /// <param name="anytype1">anytype1</param>
+        /// <param name="mapProperty">mapProperty</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
+        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
+        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object anytype1 = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -69,21 +69,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapProperty = mapProperty;
+            EmptyMap = emptyMap;
             MapOfMapProperty = mapOfMapProperty;
-            Anytype1 = anytype1;
+            MapProperty = mapProperty;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
-            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
+            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -92,10 +93,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapProperty
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object Anytype1 { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -115,19 +116,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_with_undeclared_properties_anytype_3")]
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
-        /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
-        /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
         [JsonPropertyName("map_with_undeclared_properties_string")]
         public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [JsonPropertyName("anytype_1")]
+        public Object Anytype1 { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -142,14 +142,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -187,14 +187,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, string> mapProperty = default;
+            Object emptyMap = default;
             Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
-            Object anytype1 = default;
+            Dictionary<string, string> mapProperty = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
-            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
+            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -211,14 +211,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -229,19 +229,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
+            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
         }
 
         /// <summary>
@@ -255,22 +255,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_of_map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
+            writer.WritePropertyName("map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
index 73eee830ea0..3610a2a0bec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -32,10 +32,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="type">type</param>
         /// <param name="message">message</param>
+        /// <param name="type">type</param>
         [JsonConstructor]
-        public ApiResponse(int code, string type, string message)
+        public ApiResponse(int code, string message, string type)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -53,8 +53,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Type = type;
             Message = message;
+            Type = type;
         }
 
         /// <summary>
@@ -63,18 +63,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Type
-        /// </summary>
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or Sets Message
         /// </summary>
         [JsonPropertyName("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -90,8 +90,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -130,8 +130,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string type = default;
             string message = default;
+            string type = default;
 
             while (reader.Read())
             {
@@ -151,19 +151,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "type":
-                            type = reader.GetString();
-                            break;
                         case "message":
                             message = reader.GetString();
                             break;
+                        case "type":
+                            type = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, type, message);
+            return new ApiResponse(code, message, type);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("type", apiResponse.Type);
             writer.WriteString("message", apiResponse.Message);
+            writer.WriteString("type", apiResponse.Type);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
index d628f7aac0b..ef26590ab3c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
-        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
+        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
+        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
+            ArrayOfString = arrayOfString;
         }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
+            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
         }
 
         /// <summary>
@@ -177,12 +177,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
index 8cb011aa50c..0d25bc70612 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         /// <param name="capitalCamel">capitalCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         [JsonConstructor]
-        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
+        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,19 +64,20 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SmallCamel = smallCamel;
+            ATT_NAME = aTTNAME;
             CapitalCamel = capitalCamel;
-            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
+            SmallSnake = smallSnake;
         }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -84,12 +85,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SmallSnake
-        /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
-
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -103,11 +98,16 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -123,12 +123,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -166,12 +166,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string smallCamel = default;
+            string aTTNAME = default;
             string capitalCamel = default;
-            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string aTTNAME = default;
+            string smallCamel = default;
+            string smallSnake = default;
 
             while (reader.Read())
             {
@@ -188,23 +188,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
-                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
+                            break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
                             break;
                         default:
                             break;
@@ -212,7 +212,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
+            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
         }
 
         /// <summary>
@@ -226,12 +226,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
index 444fbaaccdb..113fd3d276d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         /// <param name="id">id</param>
+        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         [JsonConstructor]
-        public Category(string name = "default-name", long id)
+        public Category(long id, string name = "default-name")
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,22 +48,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Name = name;
             Id = id;
+            Name = name;
         }
 
-        /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [JsonPropertyName("id")]
         public long Id { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string name = default;
             long id = default;
+            string name = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
                         case "id":
                             id = reader.GetInt64();
                             break;
+                        case "name":
+                            name = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(name, id);
+            return new Category(id, name);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("name", category.Name);
             writer.WriteNumber("id", category.Id);
+            writer.WriteString("name", category.Name);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
index 81fd55bd903..be70d0da28b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="_class">_class</param>
+        /// <param name="classProperty">classProperty</param>
         [JsonConstructor]
-        public ClassModel(string _class)
+        public ClassModel(string classProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Class = _class;
+            ClassProperty = classProperty;
         }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets ClassProperty
         /// </summary>
         [JsonPropertyName("_class")]
-        public string Class { get; set; }
+        public string ClassProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _class = default;
+            string classProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            _class = reader.GetString();
+                            classProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(_class);
+            return new ClassModel(classProperty);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.Class);
+            writer.WriteString("_class", classModel.ClassProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
index 4d107d8d323..6de00f19504 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="nullableShape">nullableShape</param>
         /// <param name="shapes">shapes</param>
+        /// <param name="nullableShape">nullableShape</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape nullableShape = default, List<Shape> shapes) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape nullableShape = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            NullableShape = nullableShape;
             Shapes = shapes;
+            NullableShape = nullableShape;
         }
 
         /// <summary>
@@ -71,18 +71,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets NullableShape
-        /// </summary>
-        [JsonPropertyName("nullableShape")]
-        public NullableShape NullableShape { get; set; }
-
         /// <summary>
         /// Gets or Sets Shapes
         /// </summary>
         [JsonPropertyName("shapes")]
         public List<Shape> Shapes { get; set; }
 
+        /// <summary>
+        /// Gets or Sets NullableShape
+        /// </summary>
+        [JsonPropertyName("nullableShape")]
+        public NullableShape NullableShape { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -94,8 +94,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("  Shapes: ").Append(Shapes).Append("\n");
+            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -134,8 +134,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            NullableShape nullableShape = default;
             List<Shape> shapes = default;
+            NullableShape nullableShape = default;
 
             while (reader.Read())
             {
@@ -158,19 +158,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "nullableShape":
-                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
-                            break;
                         case "shapes":
                             shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
                             break;
+                        case "nullableShape":
+                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
+            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
         }
 
         /// <summary>
@@ -188,10 +188,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("nullableShape");
-            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
             writer.WritePropertyName("shapes");
             JsonSerializer.Serialize(writer, drawing.Shapes, options);
+            writer.WritePropertyName("nullableShape");
+            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index 724ee8139bf..c6dcd8b5b24 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
+        /// <param name="justSymbol">justSymbol</param>
         [JsonConstructor]
-        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
+        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,41 +48,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
+            JustSymbol = justSymbol;
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Defines ArrayEnum
         /// </summary>
-        public enum JustSymbolEnum
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -91,54 +91,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
-        /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -147,17 +141,23 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
+        /// <summary>
+        /// Gets or Sets JustSymbol
+        /// </summary>
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
+            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -217,8 +217,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumArrays.JustSymbolEnum justSymbol = default;
             List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
+            EnumArrays.JustSymbolEnum justSymbol = default;
 
             while (reader.Read())
             {
@@ -235,20 +235,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(justSymbol, arrayEnum);
+            return new EnumArrays(arrayEnum, justSymbol);
         }
 
         /// <summary>
@@ -262,13 +262,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 530cc907a07..9c13e1739d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -31,17 +31,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="outerEnum">outerEnum</param>
-        /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="enumString">enumString</param>
+        /// <param name="enumStringRequired">enumStringRequired</param>
         /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
+        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -73,56 +73,48 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EnumStringRequired = enumStringRequired;
-            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            OuterEnum = outerEnum;
-            OuterEnumInteger = outerEnumInteger;
+            EnumString = enumString;
+            EnumStringRequired = enumStringRequired;
             OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnumInteger = outerEnumInteger;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
+            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            Lower = 2,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -131,65 +123,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -198,57 +173,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            NUMBER_1 = 1,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -257,48 +223,62 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            return (int) value;
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
+
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -307,48 +287,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -357,28 +354,31 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
 
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -386,18 +386,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("outerEnumInteger")]
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
-        /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
-        /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
-
         /// <summary>
         /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
         [JsonPropertyName("outerEnumIntegerDefaultValue")]
         public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
+        /// <summary>
+        /// Gets or Sets OuterEnum
+        /// </summary>
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -412,15 +412,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
-            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
             sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -458,15 +458,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            OuterEnum? outerEnum = default;
-            OuterEnumInteger outerEnumInteger = default;
+            EnumTest.EnumStringEnum enumString = default;
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
             OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnumInteger outerEnumInteger = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
+            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -483,14 +483,6 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
-                            break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
-                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -500,29 +492,37 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
+            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
         }
 
         /// <summary>
@@ -536,41 +536,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
-            if (enumStringRequiredRawValue != null)
-                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
-            else
-                writer.WriteNull("enum_string_required");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
             var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
             if (enumStringRawValue != null)
                 writer.WriteString("enum_string", enumStringRawValue);
             else
                 writer.WriteNull("enum_string");
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
-            if (outerEnumIntegerRawValue != null)
-                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
+            if (enumStringRequiredRawValue != null)
+                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
-                writer.WriteNull("outerEnumInteger");
+                writer.WriteNull("enum_string_required");
             var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
+            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            if (outerEnumIntegerRawValue != null)
+                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            else
+                writer.WriteNull("outerEnumInteger");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index bf0b8bec3f0..a17a59ac541 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="_string">_string</param>
+        /// <param name="stringProperty">stringProperty</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo _string)
+        public FooGetDefaultResponse(Foo stringProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            String = _string;
+            StringProperty = stringProperty;
         }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets StringProperty
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo String { get; set; }
+        public Foo StringProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo _string = default;
+            Foo stringProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(_string);
+            return new FooGetDefaultResponse(stringProperty);
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
index d0dd73bfe2e..3b28c9e5a5c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -31,24 +31,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="number">number</param>
-        /// <param name="_byte">_byte</param>
+        /// <param name="binary">binary</param>
+        /// <param name="byteProperty">byteProperty</param>
         /// <param name="date">date</param>
-        /// <param name="password">password</param>
-        /// <param name="integer">integer</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="decimalProperty">decimalProperty</param>
+        /// <param name="doubleProperty">doubleProperty</param>
+        /// <param name="floatProperty">floatProperty</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="_float">_float</param>
-        /// <param name="_double">_double</param>
-        /// <param name="_decimal">_decimal</param>
-        /// <param name="_string">_string</param>
-        /// <param name="binary">binary</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="uuid">uuid</param>
+        /// <param name="integer">integer</param>
+        /// <param name="number">number</param>
+        /// <param name="password">password</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
+        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
+        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -65,20 +65,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (_float == null)
-                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
+            if (floatProperty == null)
+                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
 
-            if (_double == null)
-                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
+            if (doubleProperty == null)
+                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
 
-            if (_decimal == null)
-                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
+            if (decimalProperty == null)
+                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
 
-            if (_byte == null)
-                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
+            if (byteProperty == null)
+                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -104,35 +104,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Number = number;
-            Byte = _byte;
+            Binary = binary;
+            ByteProperty = byteProperty;
             Date = date;
-            Password = password;
-            Integer = integer;
+            DateTime = dateTime;
+            DecimalProperty = decimalProperty;
+            DoubleProperty = doubleProperty;
+            FloatProperty = floatProperty;
             Int32 = int32;
             Int64 = int64;
-            Float = _float;
-            Double = _double;
-            Decimal = _decimal;
-            String = _string;
-            Binary = binary;
-            DateTime = dateTime;
-            Uuid = uuid;
+            Integer = integer;
+            Number = number;
+            Password = password;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
+            StringProperty = stringProperty;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Binary
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets Byte
+        /// Gets or Sets ByteProperty
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] Byte { get; set; }
+        public byte[] ByteProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -141,70 +141,58 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets DecimalProperty
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Int32
-        /// </summary>
-        [JsonPropertyName("int32")]
-        public int Int32 { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal DecimalProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Int64
+        /// Gets or Sets DoubleProperty
         /// </summary>
-        [JsonPropertyName("int64")]
-        public long Int64 { get; set; }
+        [JsonPropertyName("double")]
+        public double DoubleProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Float
+        /// Gets or Sets FloatProperty
         /// </summary>
         [JsonPropertyName("float")]
-        public float Float { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Double
-        /// </summary>
-        [JsonPropertyName("double")]
-        public double Double { get; set; }
+        public float FloatProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Decimal
+        /// Gets or Sets Int32
         /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal Decimal { get; set; }
+        [JsonPropertyName("int32")]
+        public int Int32 { get; set; }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets Int64
         /// </summary>
-        [JsonPropertyName("string")]
-        public string String { get; set; }
+        [JsonPropertyName("int64")]
+        public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets Uuid
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
         /// A string that is a 10 digit number. Can have leading zeros.
@@ -220,6 +208,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("pattern_with_digits_and_delimiter")]
         public string PatternWithDigitsAndDelimiter { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProperty
+        /// </summary>
+        [JsonPropertyName("string")]
+        public string StringProperty { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -234,22 +234,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Byte: ").Append(Byte).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
+            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
+            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Float: ").Append(Float).Append("\n");
-            sb.Append("  Double: ").Append(Double).Append("\n");
-            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
-            sb.Append("  String: ").Append(String).Append("\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -261,40 +261,28 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
-            }
-
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // DoubleProperty (double) maximum
+            if (this.DoubleProperty > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
-            }
-
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
             }
 
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // DoubleProperty (double) minimum
+            if (this.DoubleProperty < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // FloatProperty (float) maximum
+            if (this.FloatProperty > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // FloatProperty (float) minimum
+            if (this.FloatProperty < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
             }
 
             // Int32 (int) maximum
@@ -309,35 +297,40 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Float (float) maximum
-            if (this.Float > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // Float (float) minimum
-            if (this.Float < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
-            // Double (double) maximum
-            if (this.Double > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
             }
 
-            // Double (double) minimum
-            if (this.Double < (double)67.8)
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
             }
 
-            // String (string) pattern
-            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexString.Match(this.String).Success)
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+            }
+
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
             // PatternWithDigits (string) pattern
@@ -354,6 +347,13 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
+            // StringProperty (string) pattern
+            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexStringProperty.Match(this.StringProperty).Success)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
+            }
+
             yield break;
         }
     }
@@ -380,22 +380,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            decimal number = default;
-            byte[] _byte = default;
+            System.IO.Stream binary = default;
+            byte[] byteProperty = default;
             DateTime date = default;
-            string password = default;
-            int integer = default;
+            DateTime dateTime = default;
+            decimal decimalProperty = default;
+            double doubleProperty = default;
+            float floatProperty = default;
             int int32 = default;
             long int64 = default;
-            float _float = default;
-            double _double = default;
-            decimal _decimal = default;
-            string _string = default;
-            System.IO.Stream binary = default;
-            DateTime dateTime = default;
-            Guid uuid = default;
+            int integer = default;
+            decimal number = default;
+            string password = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
+            string stringProperty = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -412,20 +412,26 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "number":
-                            number = reader.GetInt32();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
                         case "byte":
-                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "decimal":
+                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
+                            break;
+                        case "double":
+                            doubleProperty = reader.GetDouble();
+                            break;
+                        case "float":
+                            floatProperty = (float)reader.GetDouble();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -433,26 +439,14 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "float":
-                            _float = (float)reader.GetDouble();
-                            break;
-                        case "double":
-                            _double = reader.GetDouble();
-                            break;
-                        case "decimal":
-                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "string":
-                            _string = reader.GetString();
-                            break;
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
+                        case "password":
+                            password = reader.GetString();
                             break;
                         case "pattern_with_digits":
                             patternWithDigits = reader.GetString();
@@ -460,13 +454,19 @@ namespace Org.OpenAPITools.Model
                         case "pattern_with_digits_and_delimiter":
                             patternWithDigitsAndDelimiter = reader.GetString();
                             break;
+                        case "string":
+                            stringProperty = reader.GetString();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
+            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
         }
 
         /// <summary>
@@ -480,27 +480,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("number", formatTest.Number);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.Byte, options);
+            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WriteString("password", formatTest.Password);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("int32", formatTest.Int32);
-            writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("float", formatTest.Float);
-            writer.WriteNumber("double", formatTest.Double);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
-            writer.WriteString("string", formatTest.String);
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WriteString("uuid", formatTest.Uuid);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
+            writer.WriteNumber("double", formatTest.DoubleProperty);
+            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteNumber("int32", formatTest.Int32);
+            writer.WriteNumber("int64", formatTest.Int64);
+            writer.WriteNumber("integer", formatTest.Integer);
+            writer.WriteNumber("number", formatTest.Number);
+            writer.WriteString("password", formatTest.Password);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
+            writer.WriteString("string", formatTest.StringProperty);
+            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
index 413f56633ab..777120531d2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="mapMapOfString">mapMapOfString</param>
-        /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
+        /// <param name="mapMapOfString">mapMapOfString</param>
+        /// <param name="mapOfEnumString">mapOfEnumString</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
+        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,10 +56,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapMapOfString = mapMapOfString;
-            MapOfEnumString = mapOfEnumString;
             DirectMap = directMap;
             IndirectMap = indirectMap;
+            MapMapOfString = mapMapOfString;
+            MapOfEnumString = mapOfEnumString;
         }
 
         /// <summary>
@@ -112,18 +112,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets MapMapOfString
-        /// </summary>
-        [JsonPropertyName("map_map_of_string")]
-        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -136,6 +124,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("indirect_map")]
         public Dictionary<string, bool> IndirectMap { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapMapOfString
+        /// </summary>
+        [JsonPropertyName("map_map_of_string")]
+        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -150,10 +150,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
-            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
             sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
+            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
+            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -191,10 +191,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
-            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
             Dictionary<string, bool> directMap = default;
             Dictionary<string, bool> indirectMap = default;
+            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
+            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
 
             while (reader.Read())
             {
@@ -211,25 +211,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_map_of_string":
-                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
-                            break;
-                        case "map_of_enum_string":
-                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
-                            break;
                         case "direct_map":
                             directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
                         case "indirect_map":
                             indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
+                        case "map_map_of_string":
+                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
+                            break;
+                        case "map_of_enum_string":
+                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
         }
 
         /// <summary>
@@ -243,14 +243,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_map_of_string");
-            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
-            writer.WritePropertyName("map_of_enum_string");
-            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
             writer.WritePropertyName("direct_map");
             JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
             writer.WritePropertyName("indirect_map");
             JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
+            writer.WritePropertyName("map_map_of_string");
+            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
+            writer.WritePropertyName("map_of_enum_string");
+            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 520c4896c8b..4806980e331 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
+        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
+            Uuid = uuid;
         }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
+            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
         }
 
         /// <summary>
@@ -177,11 +177,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
index e805657a406..e4e9a8611ab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
+        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
-        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(int name, string _class)
+        public Model200Response(string classProperty, int name)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,27 +42,27 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ClassProperty = classProperty;
             Name = name;
-            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Gets or Sets ClassProperty
         /// </summary>
-        [JsonPropertyName("name")]
-        public int Name { get; set; }
+        [JsonPropertyName("class")]
+        public string ClassProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("class")]
-        public string Class { get; set; }
+        [JsonPropertyName("name")]
+        public int Name { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            string classProperty = default;
             int name = default;
-            string _class = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "class":
+                            classProperty = reader.GetString();
+                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
-                        case "class":
-                            _class = reader.GetString();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(name, _class);
+            return new Model200Response(classProperty, name);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
-            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
index bb6857ac351..dc243ef72f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="_client">_client</param>
+        /// <param name="clientProperty">clientProperty</param>
         [JsonConstructor]
-        public ModelClient(string _client)
+        public ModelClient(string clientProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_client == null)
-                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
+            if (clientProperty == null)
+                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _Client = _client;
+            _ClientProperty = clientProperty;
         }
 
         /// <summary>
-        /// Gets or Sets _Client
+        /// Gets or Sets _ClientProperty
         /// </summary>
         [JsonPropertyName("client")]
-        public string _Client { get; set; }
+        public string _ClientProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _Client: ").Append(_Client).Append("\n");
+            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _client = default;
+            string clientProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            _client = reader.GetString();
+                            clientProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(_client);
+            return new ModelClient(clientProperty);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._Client);
+            writer.WriteString("client", modelClient._ClientProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
index f22e38dfc5b..9b07795a3e5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs
@@ -32,17 +32,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="snakeCase">snakeCase</param>
         /// <param name="property">property</param>
+        /// <param name="snakeCase">snakeCase</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, int snakeCase, string property, int _123number)
+        public Name(int nameProperty, string property, int snakeCase, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (name == null)
-                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
+            if (nameProperty == null)
+                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            SnakeCase = snakeCase;
             Property = property;
+            SnakeCase = snakeCase;
             _123Number = _123number;
         }
 
@@ -68,18 +68,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SnakeCase
-        /// </summary>
-        [JsonPropertyName("snake_case")]
-        public int SnakeCase { get; }
-
         /// <summary>
         /// Gets or Sets Property
         /// </summary>
         [JsonPropertyName("property")]
         public string Property { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SnakeCase
+        /// </summary>
+        [JsonPropertyName("snake_case")]
+        public int SnakeCase { get; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -101,8 +101,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  Property: ").Append(Property).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -179,8 +179,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            int snakeCase = default;
             string property = default;
+            int snakeCase = default;
             int _123number = default;
 
             while (reader.Read())
@@ -201,12 +201,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "snake_case":
-                            snakeCase = reader.GetInt32();
-                            break;
                         case "property":
                             property = reader.GetString();
                             break;
+                        case "snake_case":
+                            snakeCase = reader.GetInt32();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -216,7 +216,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, snakeCase, property, _123number);
+            return new Name(nameProperty, property, snakeCase, _123number);
         }
 
         /// <summary>
@@ -231,8 +231,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteString("property", name.Property);
+            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
index 2ad9b9f2522..5267e11d8b1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
         /// <param name="booleanProp">booleanProp</param>
-        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object> arrayNullableProp = default, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object> objectNullableProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
+        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectNullableProp = default, string stringProp = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,43 +58,49 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
+            ArrayItemsNullable = arrayItemsNullable;
+            ObjectItemsNullable = objectItemsNullable;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
             BooleanProp = booleanProp;
-            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            ArrayNullableProp = arrayNullableProp;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectNullableProp = objectNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             ObjectAndItemsNullableProp = objectAndItemsNullableProp;
-            ObjectItemsNullable = objectItemsNullable;
+            ObjectNullableProp = objectNullableProp;
+            StringProp = stringProp;
         }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ObjectItemsNullable
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets BooleanProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("boolean_prop")]
-        public bool? BooleanProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object> ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string StringProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object> ArrayNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BooleanProp
+        /// </summary>
+        [JsonPropertyName("boolean_prop")]
+        public bool? BooleanProp { get; set; }
 
         /// <summary>
         /// Gets or Sets DateProp
@@ -109,22 +115,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object> ArrayNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object> ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -133,16 +139,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
-        /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
+        /// Gets or Sets StringProp
         /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
+        [JsonPropertyName("string_prop")]
+        public string StringProp { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -153,18 +153,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -201,18 +201,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            int? integerProp = default;
-            decimal? numberProp = default;
+            List<Object> arrayItemsNullable = default;
+            Dictionary<string, Object> objectItemsNullable = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
             bool? booleanProp = default;
-            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            List<Object> arrayNullableProp = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             Dictionary<string, Object> objectAndItemsNullableProp = default;
-            Dictionary<string, Object> objectItemsNullable = default;
+            Dictionary<string, Object> objectNullableProp = default;
+            string stringProp = default;
 
             while (reader.Read())
             {
@@ -229,43 +229,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                            break;
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
-                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "string_prop":
+                            stringProp = reader.GetString();
                             break;
                         default:
                             break;
@@ -273,7 +273,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
+            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
         }
 
         /// <summary>
@@ -287,35 +287,35 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            if (nullableClass.IntegerProp != null)
-                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
-            else
-                writer.WriteNull("integer_prop");
-            if (nullableClass.NumberProp != null)
-                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
-            else
-                writer.WriteNull("number_prop");
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
             if (nullableClass.BooleanProp != null)
                 writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
             else
                 writer.WriteNull("boolean_prop");
-            writer.WriteString("string_prop", nullableClass.StringProp);
             writer.WritePropertyName("date_prop");
             JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
             writer.WritePropertyName("datetime_prop");
             JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            if (nullableClass.IntegerProp != null)
+                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
+            else
+                writer.WriteNull("integer_prop");
+            if (nullableClass.NumberProp != null)
+                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
+            else
+                writer.WriteNull("number_prop");
             writer.WritePropertyName("object_and_items_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("object_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            writer.WriteString("string_prop", nullableClass.StringProp);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index 5799fd94e53..225a89ebe9a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
-        /// <param name="id">id</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
         /// <param name="bars">bars</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="id">id</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
+        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,24 +56,18 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
-            Id = id;
-            DeprecatedRef = deprecatedRef;
             Bars = bars;
+            DeprecatedRef = deprecatedRef;
+            Id = id;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -83,11 +77,17 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -103,10 +103,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
             sb.Append("  Bars: ").Append(Bars).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -144,10 +144,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string uuid = default;
-            decimal id = default;
-            DeprecatedObject deprecatedRef = default;
             List<string> bars = default;
+            DeprecatedObject deprecatedRef = default;
+            decimal id = default;
+            string uuid = default;
 
             while (reader.Read())
             {
@@ -164,17 +164,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetString();
-                            break;
-                        case "id":
-                            id = reader.GetInt32();
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "deprecatedRef":
                             deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
                             break;
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "id":
+                            id = reader.GetInt32();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         default:
                             break;
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
+            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
         }
 
         /// <summary>
@@ -196,12 +196,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WritePropertyName("deprecatedRef");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
             writer.WritePropertyName("bars");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WritePropertyName("deprecatedRef");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
index bedf2f03a7f..67d1551e614 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
+        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
-        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
+        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
-            MyBoolean = myBoolean;
         }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
-            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myNumber, myString, myBoolean);
+            return new OuterComposite(myBoolean, myNumber, myString);
         }
 
         /// <summary>
@@ -177,9 +177,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
index 0d090017be7..623ba045e38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
+        /// <param name="category">category</param>
+        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="id">id</param>
-        /// <param name="category">category</param>
-        /// <param name="tags">tags</param>
         /// <param name="status">pet status in the store</param>
+        /// <param name="tags">tags</param>
         [JsonConstructor]
-        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
+        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,12 +64,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Category = category;
+            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Id = id;
-            Category = category;
-            Tags = tags;
             Status = status;
+            Tags = tags;
         }
 
         /// <summary>
@@ -142,16 +142,10 @@ namespace Org.OpenAPITools.Model
         public StatusEnum Status { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or Sets PhotoUrls
+        /// Gets or Sets Category
         /// </summary>
-        [JsonPropertyName("photoUrls")]
-        public List<string> PhotoUrls { get; set; }
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
 
         /// <summary>
         /// Gets or Sets Id
@@ -160,10 +154,16 @@ namespace Org.OpenAPITools.Model
         public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets Category
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        [JsonPropertyName("photoUrls")]
+        public List<string> PhotoUrls { get; set; }
 
         /// <summary>
         /// Gets or Sets Tags
@@ -185,12 +185,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Category category = default;
+            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            long id = default;
-            Category category = default;
-            List<Tag> tags = default;
             Pet.StatusEnum status = default;
+            List<Tag> tags = default;
 
             while (reader.Read())
             {
@@ -250,32 +250,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
-                        case "photoUrls":
-                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "id":
                             id = reader.GetInt64();
                             break;
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
+                        case "name":
+                            name = reader.GetString();
                             break;
-                        case "tags":
-                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                        case "photoUrls":
+                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "status":
                             string statusRawValue = reader.GetString();
                             status = Pet.StatusEnumFromString(statusRawValue);
                             break;
+                        case "tags":
+                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(name, photoUrls, id, category, tags, status);
+            return new Pet(category, id, name, photoUrls, status, tags);
         }
 
         /// <summary>
@@ -289,19 +289,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
-            writer.WriteNumber("id", pet.Id);
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
index fc6815b4f91..3ddbc0ada7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs
@@ -38,8 +38,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_return == null)
-                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
+            if (returnProperty == null)
+                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
index c9d60d18139..92b7dee149e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialPropertyName">specialPropertyName</param>
         /// <param name="specialModelNameProperty">specialModelNameProperty</param>
+        /// <param name="specialPropertyName">specialPropertyName</param>
         [JsonConstructor]
-        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
+        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelName == null)
-                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
+            if (specialModelNameProperty == null)
+                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialPropertyName = specialPropertyName;
             SpecialModelNameProperty = specialModelNameProperty;
+            SpecialPropertyName = specialPropertyName;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialPropertyName
-        /// </summary>
-        [JsonPropertyName("$special[property.name]")]
-        public long SpecialPropertyName { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialModelNameProperty
         /// </summary>
         [JsonPropertyName("_special_model.name_")]
         public string SpecialModelNameProperty { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialPropertyName
+        /// </summary>
+        [JsonPropertyName("$special[property.name]")]
+        public long SpecialPropertyName { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
+            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long specialPropertyName = default;
             string specialModelNameProperty = default;
+            long specialPropertyName = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "$special[property.name]":
-                            specialPropertyName = reader.GetInt64();
-                            break;
                         case "_special_model.name_":
                             specialModelNameProperty = reader.GetString();
                             break;
+                        case "$special[property.name]":
+                            specialPropertyName = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
+            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
             writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
+            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
index c59706d5d0c..c1b37bf1aa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="id">id</param>
-        /// <param name="username">username</param>
+        /// <param name="email">email</param>
         /// <param name="firstName">firstName</param>
+        /// <param name="id">id</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="email">email</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
+        /// <param name="username">username</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object objectWithNoDeclaredPropsNullable = default, Object anyTypeProp = default, Object anyTypePropNullable = default)
+        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -79,31 +79,25 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
-            Username = username;
+            Email = email;
             FirstName = firstName;
+            Id = id;
             LastName = lastName;
-            Email = email;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
+            Username = username;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Username
+        /// Gets or Sets Email
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets FirstName
@@ -111,6 +105,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("firstName")]
         public string FirstName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
@@ -118,10 +118,11 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -143,18 +144,10 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
-
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// Gets or Sets Username
         /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -170,6 +163,13 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object AnyTypePropNullable { get; set; }
 
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -184,18 +184,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -233,18 +233,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
-            string username = default;
+            string email = default;
             string firstName = default;
+            long id = default;
             string lastName = default;
-            string email = default;
+            Object objectWithNoDeclaredProps = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            Object objectWithNoDeclaredProps = default;
-            Object objectWithNoDeclaredPropsNullable = default;
+            string username = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
+            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -261,20 +261,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
-                        case "username":
-                            username = reader.GetString();
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "email":
-                            email = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "password":
                             password = reader.GetString();
@@ -285,11 +285,8 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -297,13 +294,16 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
+            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
         }
 
         /// <summary>
@@ -317,22 +317,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", user.Id);
-            writer.WriteString("username", user.Username);
+            writer.WriteString("email", user.Email);
             writer.WriteString("firstName", user.FirstName);
+            writer.WriteNumber("id", user.Id);
             writer.WriteString("lastName", user.LastName);
-            writer.WriteString("email", user.Email);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
+            writer.WriteString("username", user.Username);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
index cf0f5c871be..65d841c450c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES
@@ -92,31 +92,38 @@ docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
 src/Org.OpenAPITools/Api/DefaultApi.cs
 src/Org.OpenAPITools/Api/FakeApi.cs
 src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+src/Org.OpenAPITools/Api/IApi.cs
 src/Org.OpenAPITools/Api/PetApi.cs
 src/Org.OpenAPITools/Api/StoreApi.cs
 src/Org.OpenAPITools/Api/UserApi.cs
 src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiFactory.cs
 src/Org.OpenAPITools/Client/ApiKeyToken.cs
 src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/HostConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
 src/Org.OpenAPITools/Client/HttpSigningToken.cs
-src/Org.OpenAPITools/Client/IApi.cs
 src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 src/Org.OpenAPITools/Client/OAuthToken.cs
-src/Org.OpenAPITools/Client/OpenAPIDateJsonConverter.cs
 src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 src/Org.OpenAPITools/Client/TokenBase.cs
 src/Org.OpenAPITools/Client/TokenContainer`1.cs
 src/Org.OpenAPITools/Client/TokenProvider`1.cs
+src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 src/Org.OpenAPITools/Model/Activity.cs
 src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs
 src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -197,3 +204,4 @@ src/Org.OpenAPITools/Model/User.cs
 src/Org.OpenAPITools/Model/Whale.cs
 src/Org.OpenAPITools/Model/Zebra.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
index 84e52ff3149..f9c1c7f7462 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md
@@ -1,265 +1 @@
-# Org.OpenAPITools - the C# library for the OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 1.0.0
-- SDK version: 1.0.0
-- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
-
-<a name="frameworks-supported"></a>
-## Frameworks supported
-- .NET Core >=1.0
-- .NET Framework >=4.6
-- Mono/Xamarin >=vNext
-
-<a name="dependencies"></a>
-## Dependencies
-
-- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
-- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
-- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
-- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
-
-The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-Install-Package Newtonsoft.Json
-Install-Package JsonSubTypes
-Install-Package System.ComponentModel.Annotations
-Install-Package CompareNETObjects
-```
-<a name="installation"></a>
-## Installation
-Generate the DLL using your preferred tool (e.g. `dotnet build`)
-
-Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
-```csharp
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-```
-<a name="usage"></a>
-## Usage
-
-To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
-```csharp
-Configuration c = new Configuration();
-System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
-webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
-c.Proxy = webProxy;
-```
-
-<a name="getting-started"></a>
-## Getting Started
-
-```csharp
-using System.Collections.Generic;
-using System.Diagnostics;
-using Org.OpenAPITools.Api;
-using Org.OpenAPITools.Client;
-using Org.OpenAPITools.Model;
-
-namespace Example
-{
-    public class Example
-    {
-        public static void Main()
-        {
-
-            Configuration config = new Configuration();
-            config.BasePath = "http://petstore.swagger.io:80/v2";
-            var apiInstance = new AnotherFakeApi(config);
-            var modelClient = new ModelClient(); // ModelClient | client model
-
-            try
-            {
-                // To test special tags
-                ModelClient result = apiInstance.Call123TestSpecialTags(modelClient);
-                Debug.WriteLine(result);
-            }
-            catch (ApiException e)
-            {
-                Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message );
-                Debug.Print("Status Code: "+ e.ErrorCode);
-                Debug.Print(e.StackTrace);
-            }
-
-        }
-    }
-}
-```
-
-<a name="documentation-for-api-endpoints"></a>
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**Call123TestSpecialTags**](docs//apisAnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**FooGet**](docs//apisDefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**FakeHealthGet**](docs//apisFakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
-*FakeApi* | [**FakeOuterBooleanSerialize**](docs//apisFakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**FakeOuterCompositeSerialize**](docs//apisFakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**FakeOuterNumberSerialize**](docs//apisFakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**FakeOuterStringSerialize**](docs//apisFakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**GetArrayOfEnums**](docs//apisFakeApi.md#getarrayofenums) | **GET** /fake/array-of-enums | Array of Enums
-*FakeApi* | [**TestBodyWithFileSchema**](docs//apisFakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**TestBodyWithQueryParams**](docs//apisFakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**TestClientModel**](docs//apisFakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**TestEndpointParameters**](docs//apisFakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**TestEnumParameters**](docs//apisFakeApi.md#testenumparameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**TestGroupParameters**](docs//apisFakeApi.md#testgroupparameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**TestInlineAdditionalProperties**](docs//apisFakeApi.md#testinlineadditionalproperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**TestJsonFormData**](docs//apisFakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**TestQueryParameterCollectionFormat**](docs//apisFakeApi.md#testqueryparametercollectionformat) | **PUT** /fake/test-query-parameters | 
-*FakeClassnameTags123Api* | [**TestClassname**](docs//apisFakeClassnameTags123Api.md#testclassname) | **PATCH** /fake_classname_test | To test class name in snake case
-*PetApi* | [**AddPet**](docs//apisPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**DeletePet**](docs//apisPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
-*PetApi* | [**FindPetsByStatus**](docs//apisPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**FindPetsByTags**](docs//apisPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**GetPetById**](docs//apisPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**UpdatePet**](docs//apisPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
-*PetApi* | [**UpdatePetWithForm**](docs//apisPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**UploadFile**](docs//apisPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**UploadFileWithRequiredFile**](docs//apisPetApi.md#uploadfilewithrequiredfile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**DeleteOrder**](docs//apisStoreApi.md#deleteorder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**GetInventory**](docs//apisStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**GetOrderById**](docs//apisStoreApi.md#getorderbyid) | **GET** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**PlaceOrder**](docs//apisStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
-*UserApi* | [**CreateUser**](docs//apisUserApi.md#createuser) | **POST** /user | Create user
-*UserApi* | [**CreateUsersWithArrayInput**](docs//apisUserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**CreateUsersWithListInput**](docs//apisUserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**DeleteUser**](docs//apisUserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
-*UserApi* | [**GetUserByName**](docs//apisUserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
-*UserApi* | [**LoginUser**](docs//apisUserApi.md#loginuser) | **GET** /user/login | Logs user into the system
-*UserApi* | [**LogoutUser**](docs//apisUserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
-*UserApi* | [**UpdateUser**](docs//apisUserApi.md#updateuser) | **PUT** /user/{username} | Updated user
-
-
-<a name="documentation-for-models"></a>
-## Documentation for Models
-
- - [Model.Activity](docs//modelsActivity.md)
- - [Model.ActivityOutputElementRepresentation](docs//modelsActivityOutputElementRepresentation.md)
- - [Model.AdditionalPropertiesClass](docs//modelsAdditionalPropertiesClass.md)
- - [Model.Animal](docs//modelsAnimal.md)
- - [Model.ApiResponse](docs//modelsApiResponse.md)
- - [Model.Apple](docs//modelsApple.md)
- - [Model.AppleReq](docs//modelsAppleReq.md)
- - [Model.ArrayOfArrayOfNumberOnly](docs//modelsArrayOfArrayOfNumberOnly.md)
- - [Model.ArrayOfNumberOnly](docs//modelsArrayOfNumberOnly.md)
- - [Model.ArrayTest](docs//modelsArrayTest.md)
- - [Model.Banana](docs//modelsBanana.md)
- - [Model.BananaReq](docs//modelsBananaReq.md)
- - [Model.BasquePig](docs//modelsBasquePig.md)
- - [Model.Capitalization](docs//modelsCapitalization.md)
- - [Model.Cat](docs//modelsCat.md)
- - [Model.CatAllOf](docs//modelsCatAllOf.md)
- - [Model.Category](docs//modelsCategory.md)
- - [Model.ChildCat](docs//modelsChildCat.md)
- - [Model.ChildCatAllOf](docs//modelsChildCatAllOf.md)
- - [Model.ClassModel](docs//modelsClassModel.md)
- - [Model.ComplexQuadrilateral](docs//modelsComplexQuadrilateral.md)
- - [Model.DanishPig](docs//modelsDanishPig.md)
- - [Model.DeprecatedObject](docs//modelsDeprecatedObject.md)
- - [Model.Dog](docs//modelsDog.md)
- - [Model.DogAllOf](docs//modelsDogAllOf.md)
- - [Model.Drawing](docs//modelsDrawing.md)
- - [Model.EnumArrays](docs//modelsEnumArrays.md)
- - [Model.EnumClass](docs//modelsEnumClass.md)
- - [Model.EnumTest](docs//modelsEnumTest.md)
- - [Model.EquilateralTriangle](docs//modelsEquilateralTriangle.md)
- - [Model.File](docs//modelsFile.md)
- - [Model.FileSchemaTestClass](docs//modelsFileSchemaTestClass.md)
- - [Model.Foo](docs//modelsFoo.md)
- - [Model.FooGetDefaultResponse](docs//modelsFooGetDefaultResponse.md)
- - [Model.FormatTest](docs//modelsFormatTest.md)
- - [Model.Fruit](docs//modelsFruit.md)
- - [Model.FruitReq](docs//modelsFruitReq.md)
- - [Model.GmFruit](docs//modelsGmFruit.md)
- - [Model.GrandparentAnimal](docs//modelsGrandparentAnimal.md)
- - [Model.HasOnlyReadOnly](docs//modelsHasOnlyReadOnly.md)
- - [Model.HealthCheckResult](docs//modelsHealthCheckResult.md)
- - [Model.IsoscelesTriangle](docs//modelsIsoscelesTriangle.md)
- - [Model.List](docs//modelsList.md)
- - [Model.Mammal](docs//modelsMammal.md)
- - [Model.MapTest](docs//modelsMapTest.md)
- - [Model.MixedPropertiesAndAdditionalPropertiesClass](docs//modelsMixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model.Model200Response](docs//modelsModel200Response.md)
- - [Model.ModelClient](docs//modelsModelClient.md)
- - [Model.Name](docs//modelsName.md)
- - [Model.NullableClass](docs//modelsNullableClass.md)
- - [Model.NullableShape](docs//modelsNullableShape.md)
- - [Model.NumberOnly](docs//modelsNumberOnly.md)
- - [Model.ObjectWithDeprecatedFields](docs//modelsObjectWithDeprecatedFields.md)
- - [Model.Order](docs//modelsOrder.md)
- - [Model.OuterComposite](docs//modelsOuterComposite.md)
- - [Model.OuterEnum](docs//modelsOuterEnum.md)
- - [Model.OuterEnumDefaultValue](docs//modelsOuterEnumDefaultValue.md)
- - [Model.OuterEnumInteger](docs//modelsOuterEnumInteger.md)
- - [Model.OuterEnumIntegerDefaultValue](docs//modelsOuterEnumIntegerDefaultValue.md)
- - [Model.ParentPet](docs//modelsParentPet.md)
- - [Model.Pet](docs//modelsPet.md)
- - [Model.Pig](docs//modelsPig.md)
- - [Model.PolymorphicProperty](docs//modelsPolymorphicProperty.md)
- - [Model.Quadrilateral](docs//modelsQuadrilateral.md)
- - [Model.QuadrilateralInterface](docs//modelsQuadrilateralInterface.md)
- - [Model.ReadOnlyFirst](docs//modelsReadOnlyFirst.md)
- - [Model.Return](docs//modelsReturn.md)
- - [Model.ScaleneTriangle](docs//modelsScaleneTriangle.md)
- - [Model.Shape](docs//modelsShape.md)
- - [Model.ShapeInterface](docs//modelsShapeInterface.md)
- - [Model.ShapeOrNull](docs//modelsShapeOrNull.md)
- - [Model.SimpleQuadrilateral](docs//modelsSimpleQuadrilateral.md)
- - [Model.SpecialModelName](docs//modelsSpecialModelName.md)
- - [Model.Tag](docs//modelsTag.md)
- - [Model.Triangle](docs//modelsTriangle.md)
- - [Model.TriangleInterface](docs//modelsTriangleInterface.md)
- - [Model.User](docs//modelsUser.md)
- - [Model.Whale](docs//modelsWhale.md)
- - [Model.Zebra](docs//modelsZebra.md)
-
-
-<a name="documentation-for-authorization"></a>
-## Documentation for Authorization
-
-<a name="api_key"></a>
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-<a name="api_key_query"></a>
-### api_key_query
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-<a name="bearer_test"></a>
-### bearer_test
-
-- **Type**: Bearer Authentication
-
-<a name="http_basic_test"></a>
-### http_basic_test
-
-- **Type**: HTTP basic authentication
-
-<a name="http_signature_test"></a>
-### http_signature_test
-
-
-<a name="petstore_auth"></a>
-### petstore_auth
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-
+# Created with Openapi Generator
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
index f17e38282a0..b815f20b5a0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md
@@ -631,7 +631,7 @@ No authorization required
 
 <a name="testbodywithqueryparams"></a>
 # **TestBodyWithQueryParams**
-> void TestBodyWithQueryParams (string query, User user)
+> void TestBodyWithQueryParams (User user, string query)
 
 
 
@@ -652,12 +652,12 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new FakeApi(config);
-            var query = "query_example";  // string | 
             var user = new User(); // User | 
+            var query = "query_example";  // string | 
 
             try
             {
-                apiInstance.TestBodyWithQueryParams(query, user);
+                apiInstance.TestBodyWithQueryParams(user, query);
             }
             catch (ApiException  e)
             {
@@ -676,7 +676,7 @@ This returns an ApiResponse object which contains the response data, status code
 ```csharp
 try
 {
-    apiInstance.TestBodyWithQueryParamsWithHttpInfo(query, user);
+    apiInstance.TestBodyWithQueryParamsWithHttpInfo(user, query);
 }
 catch (ApiException e)
 {
@@ -690,8 +690,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **query** | **string** |  |  |
 | **user** | [**User**](User.md) |  |  |
+| **query** | **string** |  |  |
 
 ### Return type
 
@@ -807,7 +807,7 @@ No authorization required
 
 <a name="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, string _string = null, System.IO.Stream binary = null, DateTime? date = null, string password = null, string callback = null, DateTime? dateTime = null)
+> void TestEndpointParameters (byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -834,17 +834,17 @@ namespace Example
             config.Password = "YOUR_PASSWORD";
 
             var apiInstance = new FakeApi(config);
+            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | None
             var number = 8.14D;  // decimal | None
             var _double = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var _byte = System.Text.Encoding.ASCII.GetBytes("BYTE_ARRAY_DATA_HERE");  // byte[] | 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 _float = 3.4F;  // float? | None (optional) 
             var integer = 56;  // int? | None (optional) 
             var int32 = 56;  // int? | None (optional) 
             var int64 = 789L;  // long? | None (optional) 
-            var _float = 3.4F;  // float? | None (optional) 
             var _string = "_string_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 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")
@@ -852,7 +852,7 @@ namespace Example
             try
             {
                 // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-                apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                apiInstance.TestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
             }
             catch (ApiException  e)
             {
@@ -872,7 +872,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-    apiInstance.TestEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+    apiInstance.TestEndpointParametersWithHttpInfo(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
 }
 catch (ApiException e)
 {
@@ -886,17 +886,17 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
+| **_byte** | **byte[]** | None |  |
 | **number** | **decimal** | None |  |
 | **_double** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **_byte** | **byte[]** | None |  |
+| **date** | **DateTime?** | None | [optional]  |
+| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
+| **_float** | **float?** | None | [optional]  |
 | **integer** | **int?** | None | [optional]  |
 | **int32** | **int?** | None | [optional]  |
 | **int64** | **long?** | None | [optional]  |
-| **_float** | **float?** | None | [optional]  |
 | **_string** | **string** | None | [optional]  |
-| **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
-| **date** | **DateTime?** | None | [optional]  |
 | **password** | **string** | None | [optional]  |
 | **callback** | **string** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
@@ -925,7 +925,7 @@ void (empty response body)
 
 <a name="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int? enumQueryInteger = null, double? enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null)
+> 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)
 
 To test enum parameters
 
@@ -950,17 +950,17 @@ namespace Example
             var apiInstance = new FakeApi(config);
             var enumHeaderStringArray = new List<string>(); // List<string> | Header parameter enum test (string array) (optional) 
             var enumQueryStringArray = new List<string>(); // List<string> | Query parameter enum test (string array) (optional) 
-            var enumQueryInteger = 1;  // int? | Query parameter enum test (double) (optional) 
             var enumQueryDouble = 1.1D;  // double? | Query parameter enum test (double) (optional) 
+            var enumQueryInteger = 1;  // int? | 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 enumFormStringArray = new List<string>(); // List<string> | Form parameter enum test (string array) (optional)  (default to $)
             var enumFormString = "_abc";  // string | Form parameter enum test (string) (optional)  (default to -efg)
 
             try
             {
                 // To test enum parameters
-                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                apiInstance.TestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
             }
             catch (ApiException  e)
             {
@@ -980,7 +980,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // To test enum parameters
-    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+    apiInstance.TestEnumParametersWithHttpInfo(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
 }
 catch (ApiException e)
 {
@@ -996,11 +996,11 @@ catch (ApiException e)
 |------|------|-------------|-------|
 | **enumHeaderStringArray** | [**List&lt;string&gt;**](string.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;string&gt;**](string.md) | Query parameter enum test (string array) | [optional]  |
-| **enumQueryInteger** | **int?** | Query parameter enum test (double) | [optional]  |
 | **enumQueryDouble** | **double?** | Query parameter enum test (double) | [optional]  |
+| **enumQueryInteger** | **int?** | 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] |
-| **enumFormStringArray** | [**List&lt;string&gt;**](string.md) | Form parameter enum test (string array) | [optional] [default to $] |
 | **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg] |
 
 ### Return type
@@ -1027,7 +1027,7 @@ No authorization required
 
 <a name="testgroupparameters"></a>
 # **TestGroupParameters**
-> void TestGroupParameters (int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup = null, bool? booleanGroup = null, long? int64Group = null)
+> void TestGroupParameters (bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null)
 
 Fake endpoint to test group parameters (optional)
 
@@ -1053,17 +1053,17 @@ namespace Example
             config.AccessToken = "YOUR_BEARER_TOKEN";
 
             var apiInstance = new FakeApi(config);
-            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredBooleanGroup = true;  // bool | Required Boolean in group parameters
+            var requiredStringGroup = 56;  // int | Required String in group parameters
             var requiredInt64Group = 789L;  // long | Required Integer in group parameters
-            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var booleanGroup = true;  // bool? | Boolean in group parameters (optional) 
+            var stringGroup = 56;  // int? | String in group parameters (optional) 
             var int64Group = 789L;  // long? | Integer in group parameters (optional) 
 
             try
             {
                 // Fake endpoint to test group parameters (optional)
-                apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                apiInstance.TestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
             }
             catch (ApiException  e)
             {
@@ -1083,7 +1083,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Fake endpoint to test group parameters (optional)
-    apiInstance.TestGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+    apiInstance.TestGroupParametersWithHttpInfo(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
 }
 catch (ApiException e)
 {
@@ -1097,11 +1097,11 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredBooleanGroup** | **bool** | Required Boolean in group parameters |  |
+| **requiredStringGroup** | **int** | Required String in group parameters |  |
 | **requiredInt64Group** | **long** | Required Integer in group parameters |  |
-| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **booleanGroup** | **bool?** | Boolean in group parameters | [optional]  |
+| **stringGroup** | **int?** | String in group parameters | [optional]  |
 | **int64Group** | **long?** | Integer in group parameters | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
index 8ece47af9ca..da6486e4cdc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md
@@ -664,7 +664,7 @@ void (empty response body)
 
 <a name="uploadfile"></a>
 # **UploadFile**
-> ApiResponse UploadFile (long petId, string additionalMetadata = null, System.IO.Stream file = null)
+> ApiResponse UploadFile (long petId, System.IO.Stream file = null, string additionalMetadata = null)
 
 uploads an image
 
@@ -689,13 +689,13 @@ namespace Example
 
             var apiInstance = new PetApi(config);
             var petId = 789L;  // long | ID of pet to update
-            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) 
+            var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image
-                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
+                ApiResponse result = apiInstance.UploadFile(petId, file, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -716,7 +716,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, additionalMetadata, file);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithHttpInfo(petId, file, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -734,8 +734,8 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **petId** | **long** | ID of pet to update |  |
-| **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 | **file** | **System.IO.Stream****System.IO.Stream** | file to upload | [optional]  |
+| **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
 
@@ -760,7 +760,7 @@ catch (ApiException e)
 
 <a name="uploadfilewithrequiredfile"></a>
 # **UploadFileWithRequiredFile**
-> ApiResponse UploadFileWithRequiredFile (long petId, System.IO.Stream requiredFile, string additionalMetadata = null)
+> ApiResponse UploadFileWithRequiredFile (System.IO.Stream requiredFile, long petId, string additionalMetadata = null)
 
 uploads an image (required)
 
@@ -784,14 +784,14 @@ namespace Example
             config.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PetApi(config);
-            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 petId = 789L;  // long | ID of pet to update
             var additionalMetadata = "additionalMetadata_example";  // string | Additional data to pass to server (optional) 
 
             try
             {
                 // uploads an image (required)
-                ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+                ApiResponse result = apiInstance.UploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
                 Debug.WriteLine(result);
             }
             catch (ApiException  e)
@@ -812,7 +812,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // uploads an image (required)
-    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata);
+    ApiResponse<ApiResponse> response = apiInstance.UploadFileWithRequiredFileWithHttpInfo(requiredFile, petId, additionalMetadata);
     Debug.Write("Status Code: " + response.StatusCode);
     Debug.Write("Response Headers: " + response.Headers);
     Debug.Write("Response Body: " + response.Data);
@@ -829,8 +829,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **petId** | **long** | ID of pet to update |  |
 | **requiredFile** | **System.IO.Stream****System.IO.Stream** | file to upload |  |
+| **petId** | **long** | ID of pet to update |  |
 | **additionalMetadata** | **string** | Additional data to pass to server | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
index fd1c1a7d62b..a862c8c112a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md
@@ -623,7 +623,7 @@ No authorization required
 
 <a name="updateuser"></a>
 # **UpdateUser**
-> void UpdateUser (string username, User user)
+> void UpdateUser (User user, string username)
 
 Updated user
 
@@ -646,13 +646,13 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             var apiInstance = new UserApi(config);
-            var username = "username_example";  // string | name that need to be deleted
             var user = new User(); // User | Updated user object
+            var username = "username_example";  // string | name that need to be deleted
 
             try
             {
                 // Updated user
-                apiInstance.UpdateUser(username, user);
+                apiInstance.UpdateUser(user, username);
             }
             catch (ApiException  e)
             {
@@ -672,7 +672,7 @@ This returns an ApiResponse object which contains the response data, status code
 try
 {
     // Updated user
-    apiInstance.UpdateUserWithHttpInfo(username, user);
+    apiInstance.UpdateUserWithHttpInfo(user, username);
 }
 catch (ApiException e)
 {
@@ -686,8 +686,8 @@ catch (ApiException e)
 
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
-| **username** | **string** | name that need to be deleted |  |
 | **user** | [**User**](User.md) | Updated user object |  |
+| **username** | **string** | name that need to be deleted |  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
index 1f919450009..f79869f95a7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**Anytype1** | **Object** |  | [optional] 
+**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype1** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype2** | **Object** |  | [optional] 
 **MapWithUndeclaredPropertiesAnytype3** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**EmptyMap** | **Object** | an object with no declared properties and no undeclared properties, hence it&#39;s an empty map. | [optional] 
 **MapWithUndeclaredPropertiesString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**Anytype1** | **Object** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
index bc808ceeae3..d89ed1a25dc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md
@@ -5,8 +5,8 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Code** | **int** |  | [optional] 
-**Type** | **string** |  | [optional] 
 **Message** | **string** |  | [optional] 
+**Type** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
index 32365e6d4d0..ed572120cd6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **ArrayArrayOfInteger** | **List&lt;List&lt;long&gt;&gt;** |  | [optional] 
 **ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [optional] 
+**ArrayOfString** | **List&lt;string&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
index fde98a967ef..9e225c17232 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SmallCamel** | **string** |  | [optional] 
+**ATT_NAME** | **string** | Name of the pet  | [optional] 
 **CapitalCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
 **CapitalSnake** | **string** |  | [optional] 
 **SCAETHFlowPoints** | **string** |  | [optional] 
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | **string** |  | [optional] 
+**SmallSnake** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
index c2cf3f8e919..6eb0a2e13ea 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [default to "default-name"]
 **Id** | **long** |  | [optional] 
+**Name** | **string** |  | [default to "default-name"]
 
 [[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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
index bb35816c914..a098828a04f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md
@@ -5,7 +5,7 @@ Model for testing model with \"_class\" property
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Class** | **string** |  | [optional] 
+**ClassProperty** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
index 18117e6c938..fcee9662afb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md
@@ -6,8 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MainShape** | [**Shape**](Shape.md) |  | [optional] 
 **ShapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
-**NullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
 **Shapes** | [**List&lt;Shape&gt;**](Shape.md) |  | [optional] 
+**NullableShape** | [**NullableShape**](NullableShape.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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
index 2a27962cc52..7467f67978c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | **string** |  | [optional] 
 **ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
+**JustSymbol** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
index 71602270bab..53bbfe31e77 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **string** |  | 
-**EnumString** | **string** |  | [optional] 
 **EnumInteger** | **int** |  | [optional] 
 **EnumIntegerOnly** | **int** |  | [optional] 
 **EnumNumber** | **double** |  | [optional] 
-**OuterEnum** | **OuterEnum** |  | [optional] 
-**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
+**EnumString** | **string** |  | [optional] 
+**EnumStringRequired** | **string** |  | 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
+**OuterEnumInteger** | **OuterEnumInteger** |  | [optional] 
 **OuterEnumIntegerDefaultValue** | **OuterEnumIntegerDefaultValue** |  | [optional] 
+**OuterEnum** | **OuterEnum** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
index 47e50daca3e..78c99facf59 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**String** | [**Foo**](Foo.md) |  | [optional] 
+**StringProperty** | [**Foo**](Foo.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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
index 0b92c2fb10a..4e34a6d18b3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md
@@ -4,22 +4,22 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Number** | **decimal** |  | 
-**Byte** | **byte[]** |  | 
+**Binary** | **System.IO.Stream** |  | [optional] 
+**ByteProperty** | **byte[]** |  | 
 **Date** | **DateTime** |  | 
-**Password** | **string** |  | 
-**Integer** | **int** |  | [optional] 
+**DateTime** | **DateTime** |  | [optional] 
+**DecimalProperty** | **decimal** |  | [optional] 
+**DoubleProperty** | **double** |  | [optional] 
+**FloatProperty** | **float** |  | [optional] 
 **Int32** | **int** |  | [optional] 
 **Int64** | **long** |  | [optional] 
-**Float** | **float** |  | [optional] 
-**Double** | **double** |  | [optional] 
-**Decimal** | **decimal** |  | [optional] 
-**String** | **string** |  | [optional] 
-**Binary** | **System.IO.Stream** |  | [optional] 
-**DateTime** | **DateTime** |  | [optional] 
-**Uuid** | **Guid** |  | [optional] 
+**Integer** | **int** |  | [optional] 
+**Number** | **decimal** |  | 
+**Password** | **string** |  | 
 **PatternWithDigits** | **string** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **PatternWithDigitsAndDelimiter** | **string** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
+**StringProperty** | **string** |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
index aaee09f7870..5dd27228bb0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
+**MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 031d2b96065..0bac85a8e83 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **Guid** |  | [optional] 
 **DateTime** | **DateTime** |  | [optional] 
 **Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [optional] 
+**Uuid** | **Guid** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
index 8bc8049f46f..93139e1d1aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md
@@ -5,8 +5,8 @@ Model for testing model name starting with number
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ClassProperty** | **string** |  | [optional] 
 **Name** | **int** |  | [optional] 
-**Class** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
index 9e0e83645f3..51cf0636e72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_Client** | **string** |  | [optional] 
+**_ClientProperty** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
index 2ee782c0c54..11f49b9fd40 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md
@@ -6,8 +6,8 @@ Model for testing model name same as property name
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NameProperty** | **int** |  | 
-**SnakeCase** | **int** |  | [optional] [readonly] 
 **Property** | **string** |  | [optional] 
+**SnakeCase** | **int** |  | [optional] [readonly] 
 **_123Number** | **int** |  | [optional] [readonly] 
 
 [[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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
index d4a19d1856b..ac86336ea70 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**IntegerProp** | **int?** |  | [optional] 
-**NumberProp** | **decimal?** |  | [optional] 
+**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
+**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
+**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
-**StringProp** | **string** |  | [optional] 
 **DateProp** | **DateTime?** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
-**ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
-**ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
-**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**IntegerProp** | **int?** |  | [optional] 
+**NumberProp** | **decimal?** |  | [optional] 
 **ObjectAndItemsNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
-**ObjectItemsNullable** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**ObjectNullableProp** | **Dictionary&lt;string, Object&gt;** |  | [optional] 
+**StringProp** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
index b737f7d757a..9f44c24d19a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **string** |  | [optional] 
-**Id** | **decimal** |  | [optional] 
-**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
 **Bars** | **List&lt;string&gt;** |  | [optional] 
+**DeprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  | [optional] 
+**Id** | **decimal** |  | [optional] 
+**Uuid** | **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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
index abf676810fb..8985c59d094 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md
@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**MyBoolean** | **bool** |  | [optional] 
 **MyNumber** | **decimal** |  | [optional] 
 **MyString** | **string** |  | [optional] 
-**MyBoolean** | **bool** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
index 7de10304abf..b13bb576b45 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Category** | [**Category**](Category.md) |  | [optional] 
+**Id** | **long** |  | [optional] 
 **Name** | **string** |  | 
 **PhotoUrls** | **List&lt;string&gt;** |  | 
-**Id** | **long** |  | [optional] 
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
 **Status** | **string** | pet status in the store | [optional] 
+**Tags** | [**List&lt;Tag&gt;**](Tag.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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
index 662fa6f4a38..b48f3490005 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialPropertyName** | **long** |  | [optional] 
 **SpecialModelNameProperty** | **string** |  | [optional] 
+**SpecialPropertyName** | **long** |  | [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-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
index a0f0d223899..455f031674d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md
@@ -4,18 +4,18 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **long** |  | [optional] 
-**Username** | **string** |  | [optional] 
+**Email** | **string** |  | [optional] 
 **FirstName** | **string** |  | [optional] 
+**Id** | **long** |  | [optional] 
 **LastName** | **string** |  | [optional] 
-**Email** | **string** |  | [optional] 
+**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
 **Password** | **string** |  | [optional] 
 **Phone** | **string** |  | [optional] 
 **UserStatus** | **int** | User Status | [optional] 
-**ObjectWithNoDeclaredProps** | **Object** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
-**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
+**Username** | **string** |  | [optional] 
 **AnyTypeProp** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **AnyTypePropNullable** | **Object** | test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values. | [optional] 
+**ObjectWithNoDeclaredPropsNullable** | **Object** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [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-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 2bd996bd4d3..4c37cee2cda 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test special tags
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await Call123TestSpecialTagsWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,6 +174,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnCall123TestSpecialTags(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -205,7 +214,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> Call123TestSpecialTagsWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 15d8dd9dae1..c017ba3eccb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -59,7 +59,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;bool&gt;&gt;</returns>
-        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -71,7 +71,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;bool&gt;</returns>
-        Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;decimal&gt;&gt;</returns>
-        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;decimal&gt;</returns>
-        Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -177,7 +177,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -189,7 +189,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -198,11 +198,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -211,11 +211,11 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -227,7 +227,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test \&quot;client\&quot; model
@@ -239,7 +239,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -248,23 +248,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -273,23 +273,23 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -300,15 +300,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test enum parameters
@@ -319,15 +319,15 @@ namespace Org.OpenAPITools.IApi
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -336,15 +336,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -353,15 +353,15 @@ namespace Org.OpenAPITools.IApi
         /// Fake endpoint to test group parameters (optional)
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -373,7 +373,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test inline additionalProperties
@@ -385,7 +385,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -398,7 +398,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// test json serialization of form data
@@ -411,7 +411,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -427,7 +427,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -657,7 +657,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="bool"/>&gt;</returns>
-        public async Task<bool> FakeOuterBooleanSerializeAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<bool> FakeOuterBooleanSerializeAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<bool> result = await FakeOuterBooleanSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -707,7 +707,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input boolean as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="bool"/></returns>
-        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<bool>> FakeOuterBooleanSerializeWithHttpInfoAsync(bool? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -932,7 +932,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="decimal"/>&gt;</returns>
-        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<decimal> FakeOuterNumberSerializeAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<decimal> result = await FakeOuterNumberSerializeWithHttpInfoAsync(body, cancellationToken).ConfigureAwait(false);
 
@@ -982,7 +982,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="body">Input number as post body (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="decimal"/></returns>
-        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal body = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<decimal>> FakeOuterNumberSerializeWithHttpInfoAsync(decimal? body = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1315,7 +1315,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestBodyWithFileSchemaWithHttpInfoAsync(fileSchemaTestClass, cancellationToken).ConfigureAwait(false);
 
@@ -1332,7 +1332,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithFileSchemaOrDefaultAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1355,6 +1355,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual FileSchemaTestClass OnTestBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (fileSchemaTestClass == null)
+                throw new ArgumentNullException(nameof(fileSchemaTestClass));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return fileSchemaTestClass;
         }
 
@@ -1386,7 +1395,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="fileSchemaTestClass"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithFileSchemaWithHttpInfoAsync(FileSchemaTestClass fileSchemaTestClass, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1451,13 +1460,13 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1469,16 +1478,16 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestBodyWithQueryParamsOrDefaultAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestBodyWithQueryParamsWithHttpInfoAsync(query, user, cancellationToken).ConfigureAwait(false);
+                result = await TestBodyWithQueryParamsWithHttpInfoAsync(user, query, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1492,21 +1501,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        protected virtual (string, User) OnTestBodyWithQueryParams(string query, User user)
+        protected virtual (User, string) OnTestBodyWithQueryParams(User user, string query)
         {
-            return (query, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (query == null)
+                throw new ArgumentNullException(nameof(query));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, query);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, string query, User user)
+        /// <param name="query"></param>
+        protected virtual void AfterTestBodyWithQueryParams(ApiResponse<object> apiResponse, User user, string query)
         {
         }
 
@@ -1516,9 +1537,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="query"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, string query, User user)
+        /// <param name="query"></param>
+        protected virtual void OnErrorTestBodyWithQueryParams(Exception exception, string pathFormat, string path, User user, string query)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1527,19 +1548,19 @@ namespace Org.OpenAPITools.Api
         ///  
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="query"></param>
         /// <param name="user"></param>
+        /// <param name="query"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(string query = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestBodyWithQueryParamsWithHttpInfoAsync(User user, string query, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestBodyWithQueryParams(query, user);
-                query = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnTestBodyWithQueryParams(user, query);
+                user = validatedParameters.Item1;
+                query = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1586,7 +1607,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestBodyWithQueryParams(apiResponse, query, user);
+                            AfterTestBodyWithQueryParams(apiResponse, user, query);
                         }
 
                         return apiResponse;
@@ -1595,7 +1616,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, query, user);
+                OnErrorTestBodyWithQueryParams(e, "/fake/body-with-query-params", uriBuilder.Path, user, query);
                 throw;
             }
         }
@@ -1607,7 +1628,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClientModelWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -1624,7 +1645,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClientModelOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -1647,6 +1668,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClientModel(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -1678,7 +1708,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClientModelWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1752,25 +1782,25 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1782,28 +1812,28 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="object"/>&gt;</returns>
-        public async Task<object> TestEndpointParametersOrDefaultAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEndpointParametersOrDefaultAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEndpointParametersWithHttpInfoAsync(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
+                result = await TestEndpointParametersWithHttpInfoAsync(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1817,45 +1847,63 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
         /// <returns></returns>
-        protected virtual (decimal, double, string, byte[], int?, int?, long?, float?, string, System.IO.Stream, DateTime?, string, string, DateTime?) OnTestEndpointParameters(decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual (byte[], decimal, double, string, DateTime?, System.IO.Stream, float?, int?, int?, long?, string, string, string, DateTime?) OnTestEndpointParameters(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
-            return (number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (_byte == null)
+                throw new ArgumentNullException(nameof(_byte));
+
+            if (number == null)
+                throw new ArgumentNullException(nameof(number));
+
+            if (_double == null)
+                throw new ArgumentNullException(nameof(_double));
+
+            if (patternWithoutDelimiter == null)
+                throw new ArgumentNullException(nameof(patternWithoutDelimiter));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual void AfterTestEndpointParameters(ApiResponse<object> apiResponse, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
         }
 
@@ -1865,21 +1913,21 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
+        /// <param name="_byte"></param>
         /// <param name="number"></param>
         /// <param name="_double"></param>
         /// <param name="patternWithoutDelimiter"></param>
-        /// <param name="_byte"></param>
+        /// <param name="date"></param>
+        /// <param name="binary"></param>
+        /// <param name="_float"></param>
         /// <param name="integer"></param>
         /// <param name="int32"></param>
         /// <param name="int64"></param>
-        /// <param name="_float"></param>
         /// <param name="_string"></param>
-        /// <param name="binary"></param>
-        /// <param name="date"></param>
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, decimal number, double _double, string patternWithoutDelimiter, byte[] _byte, int? integer, int? int32, long? int64, float? _float, string _string, System.IO.Stream binary, DateTime? date, string password, string callback, DateTime? dateTime)
+        protected virtual void OnErrorTestEndpointParameters(Exception exception, string pathFormat, string path, byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date, System.IO.Stream binary, float? _float, int? integer, int? int32, long? int64, string _string, string password, string callback, DateTime? dateTime)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1888,40 +1936,40 @@ namespace Org.OpenAPITools.Api
         /// 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="_byte">None</param>
         /// <param name="number">None</param>
         /// <param name="_double">None</param>
         /// <param name="patternWithoutDelimiter">None</param>
-        /// <param name="_byte">None</param>
+        /// <param name="date">None (optional)</param>
+        /// <param name="binary">None (optional)</param>
+        /// <param name="_float">None (optional)</param>
         /// <param name="integer">None (optional)</param>
         /// <param name="int32">None (optional)</param>
         /// <param name="int64">None (optional)</param>
-        /// <param name="_float">None (optional)</param>
         /// <param name="_string">None (optional)</param>
-        /// <param name="binary">None (optional)</param>
-        /// <param name="date">None (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(decimal number = null, double _double = null, string patternWithoutDelimiter = null, byte[] _byte = null, int integer = null, int int32 = null, long int64 = null, float _float = null, string _string = null, System.IO.Stream binary = null, DateTime date = null, string password = null, string callback = null, DateTime dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEndpointParametersWithHttpInfoAsync(byte[] _byte, decimal number, double _double, string patternWithoutDelimiter, DateTime? date = null, System.IO.Stream binary = null, float? _float = null, int? integer = null, int? int32 = null, long? int64 = null, string _string = null, string password = null, string callback = null, DateTime? dateTime = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
-                number = validatedParameters.Item1;
-                _double = validatedParameters.Item2;
-                patternWithoutDelimiter = validatedParameters.Item3;
-                _byte = validatedParameters.Item4;
-                integer = validatedParameters.Item5;
-                int32 = validatedParameters.Item6;
-                int64 = validatedParameters.Item7;
-                _float = validatedParameters.Item8;
-                _string = validatedParameters.Item9;
-                binary = validatedParameters.Item10;
-                date = validatedParameters.Item11;
+                var validatedParameters = OnTestEndpointParameters(_byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
+                _byte = validatedParameters.Item1;
+                number = validatedParameters.Item2;
+                _double = validatedParameters.Item3;
+                patternWithoutDelimiter = validatedParameters.Item4;
+                date = validatedParameters.Item5;
+                binary = validatedParameters.Item6;
+                _float = validatedParameters.Item7;
+                integer = validatedParameters.Item8;
+                int32 = validatedParameters.Item9;
+                int64 = validatedParameters.Item10;
+                _string = validatedParameters.Item11;
                 password = validatedParameters.Item12;
                 callback = validatedParameters.Item13;
                 dateTime = validatedParameters.Item14;
@@ -1941,6 +1989,10 @@ namespace Org.OpenAPITools.Api
 
                     multipartContent.Add(new FormUrlEncodedContent(formParams));
 
+                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
+
+
+
                     formParams.Add(new KeyValuePair<string, string>("number", ClientUtils.ParameterToString(number)));
 
 
@@ -1951,9 +2003,14 @@ namespace Org.OpenAPITools.Api
 
                     formParams.Add(new KeyValuePair<string, string>("pattern_without_delimiter", ClientUtils.ParameterToString(patternWithoutDelimiter)));
 
+                    if (date != null)
+                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
 
+                    if (binary != null)
+                        multipartContent.Add(new StreamContent(binary));
 
-                    formParams.Add(new KeyValuePair<string, string>("byte", ClientUtils.ParameterToString(_byte)));
+                    if (_float != null)
+                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
 
                     if (integer != null)
                         formParams.Add(new KeyValuePair<string, string>("integer", ClientUtils.ParameterToString(integer)));
@@ -1964,18 +2021,9 @@ namespace Org.OpenAPITools.Api
                     if (int64 != null)
                         formParams.Add(new KeyValuePair<string, string>("int64", ClientUtils.ParameterToString(int64)));
 
-                    if (_float != null)
-                        formParams.Add(new KeyValuePair<string, string>("float", ClientUtils.ParameterToString(_float)));
-
                     if (_string != null)
                         formParams.Add(new KeyValuePair<string, string>("string", ClientUtils.ParameterToString(_string)));
 
-                    if (binary != null)
-                        multipartContent.Add(new StreamContent(binary));
-
-                    if (date != null)
-                        formParams.Add(new KeyValuePair<string, string>("date", ClientUtils.ParameterToString(date)));
-
                     if (password != null)
                         formParams.Add(new KeyValuePair<string, string>("password", ClientUtils.ParameterToString(password)));
 
@@ -2021,7 +2069,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEndpointParameters(apiResponse, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                            AfterTestEndpointParameters(apiResponse, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2033,7 +2081,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, password, callback, dateTime);
+                OnErrorTestEndpointParameters(e, "/fake", uriBuilder.Path, _byte, number, _double, patternWithoutDelimiter, date, binary, _float, integer, int32, int64, _string, password, callback, dateTime);
                 throw;
             }
         }
@@ -2044,17 +2092,17 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2068,20 +2116,20 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="object"/>&gt;</returns>
-        public async Task<object> TestEnumParametersOrDefaultAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestEnumParametersOrDefaultAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString, cancellationToken).ConfigureAwait(false);
+                result = await TestEnumParametersWithHttpInfoAsync(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2097,16 +2145,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
         /// <returns></returns>
-        protected virtual (List<string>, List<string>, int?, double?, string, string, List<string>, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual (List<string>, List<string>, double?, int?, List<string>, string, string, string) OnTestEnumParameters(List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
-            return (enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+            return (enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
         }
 
         /// <summary>
@@ -2115,13 +2163,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiResponse"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual void AfterTestEnumParameters(ApiResponse<object> apiResponse, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
         }
 
@@ -2133,13 +2181,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="path"></param>
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
-        /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryDouble"></param>
+        /// <param name="enumQueryInteger"></param>
+        /// <param name="enumFormStringArray"></param>
         /// <param name="enumHeaderString"></param>
         /// <param name="enumQueryString"></param>
-        /// <param name="enumFormStringArray"></param>
         /// <param name="enumFormString"></param>
-        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, int? enumQueryInteger, double? enumQueryDouble, string enumHeaderString, string enumQueryString, List<string> enumFormStringArray, string enumFormString)
+        protected virtual void OnErrorTestEnumParameters(Exception exception, string pathFormat, string path, List<string> enumHeaderStringArray, List<string> enumQueryStringArray, double? enumQueryDouble, int? enumQueryInteger, List<string> enumFormStringArray, string enumHeaderString, string enumQueryString, string enumFormString)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2150,28 +2198,28 @@ namespace Org.OpenAPITools.Api
         /// <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="enumQueryInteger">Query parameter enum test (double) (optional)</param>
         /// <param name="enumQueryDouble">Query parameter enum test (double) (optional)</param>
+        /// <param name="enumQueryInteger">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="enumFormStringArray">Form parameter enum test (string array) (optional, default to $)</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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(List<string> enumHeaderStringArray = null, List<string> enumQueryStringArray = null, int enumQueryInteger = null, double enumQueryDouble = null, string enumHeaderString = null, string enumQueryString = null, List<string> enumFormStringArray = null, string enumFormString = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestEnumParametersWithHttpInfoAsync(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, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                var validatedParameters = OnTestEnumParameters(enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 enumHeaderStringArray = validatedParameters.Item1;
                 enumQueryStringArray = validatedParameters.Item2;
-                enumQueryInteger = validatedParameters.Item3;
-                enumQueryDouble = validatedParameters.Item4;
-                enumHeaderString = validatedParameters.Item5;
-                enumQueryString = validatedParameters.Item6;
-                enumFormStringArray = validatedParameters.Item7;
+                enumQueryDouble = validatedParameters.Item3;
+                enumQueryInteger = validatedParameters.Item4;
+                enumFormStringArray = validatedParameters.Item5;
+                enumHeaderString = validatedParameters.Item6;
+                enumQueryString = validatedParameters.Item7;
                 enumFormString = validatedParameters.Item8;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2185,12 +2233,12 @@ namespace Org.OpenAPITools.Api
                     if (enumQueryStringArray != null)
                         parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString());
 
-                    if (enumQueryInteger != null)
-                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
-
                     if (enumQueryDouble != null)
                         parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString());
 
+                    if (enumQueryInteger != null)
+                        parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString());
+
                     if (enumQueryString != null)
                         parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString());
 
@@ -2242,7 +2290,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                            AfterTestEnumParameters(apiResponse, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                         }
 
                         return apiResponse;
@@ -2251,7 +2299,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryInteger, enumQueryDouble, enumHeaderString, enumQueryString, enumFormStringArray, enumFormString);
+                OnErrorTestEnumParameters(e, "/fake", uriBuilder.Path, enumHeaderStringArray, enumQueryStringArray, enumQueryDouble, enumQueryInteger, enumFormStringArray, enumHeaderString, enumQueryString, enumFormString);
                 throw;
             }
         }
@@ -2260,17 +2308,17 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -2282,20 +2330,20 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="object"/>&gt;</returns>
-        public async Task<object> TestGroupParametersOrDefaultAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestGroupParametersOrDefaultAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await TestGroupParametersWithHttpInfoAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, cancellationToken).ConfigureAwait(false);
+                result = await TestGroupParametersWithHttpInfoAsync(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -2309,29 +2357,44 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
         /// <returns></returns>
-        protected virtual (int, bool, long, int?, bool?, long?) OnTestGroupParameters(int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual (bool, int, long, bool?, int?, long?) OnTestGroupParameters(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
-            return (requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredBooleanGroup == null)
+                throw new ArgumentNullException(nameof(requiredBooleanGroup));
+
+            if (requiredStringGroup == null)
+                throw new ArgumentNullException(nameof(requiredStringGroup));
+
+            if (requiredInt64Group == null)
+                throw new ArgumentNullException(nameof(requiredInt64Group));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void AfterTestGroupParameters(ApiResponse<object> apiResponse, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
         }
 
@@ -2341,13 +2404,13 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredBooleanGroup"></param>
+        /// <param name="requiredStringGroup"></param>
         /// <param name="requiredInt64Group"></param>
-        /// <param name="stringGroup"></param>
         /// <param name="booleanGroup"></param>
+        /// <param name="stringGroup"></param>
         /// <param name="int64Group"></param>
-        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, int requiredStringGroup, bool requiredBooleanGroup, long requiredInt64Group, int? stringGroup, bool? booleanGroup, long? int64Group)
+        protected virtual void OnErrorTestGroupParameters(Exception exception, string pathFormat, string path, bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup, int? stringGroup, long? int64Group)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -2356,26 +2419,26 @@ namespace Org.OpenAPITools.Api
         /// 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="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredBooleanGroup">Required Boolean in group parameters</param>
+        /// <param name="requiredStringGroup">Required String in group parameters</param>
         /// <param name="requiredInt64Group">Required Integer in group parameters</param>
-        /// <param name="stringGroup">String in group parameters (optional)</param>
         /// <param name="booleanGroup">Boolean in group parameters (optional)</param>
+        /// <param name="stringGroup">String 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="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(int requiredStringGroup = null, bool requiredBooleanGroup = null, long requiredInt64Group = null, int stringGroup = null, bool booleanGroup = null, long int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestGroupParametersWithHttpInfoAsync(bool requiredBooleanGroup, int requiredStringGroup, long requiredInt64Group, bool? booleanGroup = null, int? stringGroup = null, long? int64Group = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnTestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-                requiredStringGroup = validatedParameters.Item1;
-                requiredBooleanGroup = validatedParameters.Item2;
+                var validatedParameters = OnTestGroupParameters(requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
+                requiredBooleanGroup = validatedParameters.Item1;
+                requiredStringGroup = validatedParameters.Item2;
                 requiredInt64Group = validatedParameters.Item3;
-                stringGroup = validatedParameters.Item4;
-                booleanGroup = validatedParameters.Item5;
+                booleanGroup = validatedParameters.Item4;
+                stringGroup = validatedParameters.Item5;
                 int64Group = validatedParameters.Item6;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -2430,7 +2493,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterTestGroupParameters(apiResponse, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                            AfterTestGroupParameters(apiResponse, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -2442,7 +2505,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+                OnErrorTestGroupParameters(e, "/fake", uriBuilder.Path, requiredBooleanGroup, requiredStringGroup, requiredInt64Group, booleanGroup, stringGroup, int64Group);
                 throw;
             }
         }
@@ -2454,7 +2517,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestInlineAdditionalPropertiesWithHttpInfoAsync(requestBody, cancellationToken).ConfigureAwait(false);
 
@@ -2471,7 +2534,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestInlineAdditionalPropertiesOrDefaultAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2494,6 +2557,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Dictionary<string, string> OnTestInlineAdditionalProperties(Dictionary<string, string> requestBody)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requestBody == null)
+                throw new ArgumentNullException(nameof(requestBody));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return requestBody;
         }
 
@@ -2525,7 +2597,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="requestBody">request body</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestInlineAdditionalPropertiesWithHttpInfoAsync(Dictionary<string, string> requestBody, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2594,7 +2666,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestJsonFormDataWithHttpInfoAsync(param, param2, cancellationToken).ConfigureAwait(false);
 
@@ -2612,7 +2684,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestJsonFormDataOrDefaultAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestJsonFormDataOrDefaultAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2636,6 +2708,18 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnTestJsonFormData(string param, string param2)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (param == null)
+                throw new ArgumentNullException(nameof(param));
+
+            if (param2 == null)
+                throw new ArgumentNullException(nameof(param2));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (param, param2);
         }
 
@@ -2670,7 +2754,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="param2">field2</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param = null, string param2 = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestJsonFormDataWithHttpInfoAsync(string param, string param2, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -2754,7 +2838,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await TestQueryParameterCollectionFormatWithHttpInfoAsync(pipe, ioutil, http, url, context, cancellationToken).ConfigureAwait(false);
 
@@ -2775,7 +2859,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> TestQueryParameterCollectionFormatOrDefaultAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -2802,6 +2886,27 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (List<string>, List<string>, List<string>, List<string>, List<string>) OnTestQueryParameterCollectionFormat(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pipe == null)
+                throw new ArgumentNullException(nameof(pipe));
+
+            if (ioutil == null)
+                throw new ArgumentNullException(nameof(ioutil));
+
+            if (http == null)
+                throw new ArgumentNullException(nameof(http));
+
+            if (url == null)
+                throw new ArgumentNullException(nameof(url));
+
+            if (context == null)
+                throw new ArgumentNullException(nameof(context));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (pipe, ioutil, http, url, context);
         }
 
@@ -2845,7 +2950,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="context"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe = null, List<string> ioutil = null, List<string> http = null, List<string> url = null, List<string> context = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> TestQueryParameterCollectionFormatWithHttpInfoAsync(List<string> pipe, List<string> ioutil, List<string> http, List<string> url, List<string> context, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index e84ca4b30db..d7ae312c657 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ModelClient&gt;&gt;</returns>
-        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// To test class name in snake case
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ModelClient&gt;</returns>
-        Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -134,7 +134,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = await TestClassnameWithHttpInfoAsync(modelClient, cancellationToken).ConfigureAwait(false);
 
@@ -151,7 +151,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ModelClient"/>&gt;</returns>
-        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ModelClient> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ModelClient> result = null;
             try 
@@ -174,6 +174,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual ModelClient OnTestClassname(ModelClient modelClient)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (modelClient == null)
+                throw new ArgumentNullException(nameof(modelClient));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return modelClient;
         }
 
@@ -205,7 +214,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="modelClient">client model</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="ModelClient"/></returns>
-        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ModelClient>> TestClassnameWithHttpInfoAsync(ModelClient modelClient, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
index 0b2d70f2449..b858b1d8430 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Add a new pet to the store
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Deletes a pet
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -87,7 +87,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by status
@@ -99,7 +99,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -111,7 +111,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;List&lt;Pet&gt;&gt;&gt;</returns>
-        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Finds Pets by tags
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;List&lt;Pet&gt;&gt;</returns>
-        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Pet&gt;&gt;</returns>
-        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find pet by ID
@@ -147,7 +147,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Pet&gt;</returns>
-        Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -159,7 +159,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Update an existing pet
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -185,7 +185,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -199,7 +199,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -209,11 +209,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image
@@ -223,11 +223,11 @@ namespace Org.OpenAPITools.IApi
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -236,12 +236,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;ApiResponse&gt;&gt;</returns>
-        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// uploads an image (required)
@@ -250,12 +250,12 @@ namespace Org.OpenAPITools.IApi
         /// 
         /// </remarks>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;ApiResponse&gt;</returns>
-        Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -340,7 +340,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await AddPetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -357,7 +357,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> AddPetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> AddPetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -380,6 +380,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnAddPet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -411,7 +420,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> AddPetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -503,7 +512,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeletePetWithHttpInfoAsync(petId, apiKey, cancellationToken).ConfigureAwait(false);
 
@@ -521,7 +530,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeletePetOrDefaultAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeletePetOrDefaultAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -545,6 +554,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string) OnDeletePet(long petId, string apiKey)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, apiKey);
         }
 
@@ -579,7 +597,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="apiKey"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId = null, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeletePetWithHttpInfoAsync(long petId, string apiKey = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -650,7 +668,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByStatusWithHttpInfoAsync(status, cancellationToken).ConfigureAwait(false);
 
@@ -667,7 +685,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByStatusOrDefaultAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -690,6 +708,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByStatus(List<string> status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (status == null)
+                throw new ArgumentNullException(nameof(status));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return status;
         }
 
@@ -721,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Status values that need to be considered for filter</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByStatusWithHttpInfoAsync(List<string> status, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -814,7 +841,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = await FindPetsByTagsWithHttpInfoAsync(tags, cancellationToken).ConfigureAwait(false);
 
@@ -831,7 +858,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="List&lt;Pet&gt;"/>&gt;</returns>
-        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<List<Pet>> FindPetsByTagsOrDefaultAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<List<Pet>> result = null;
             try 
@@ -854,6 +881,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<string> OnFindPetsByTags(List<string> tags)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (tags == null)
+                throw new ArgumentNullException(nameof(tags));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return tags;
         }
 
@@ -885,7 +921,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="tags">Tags to filter by</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="List&lt;Pet&gt;"/></returns>
-        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<List<Pet>>> FindPetsByTagsWithHttpInfoAsync(List<string> tags, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -978,7 +1014,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = await GetPetByIdWithHttpInfoAsync(petId, cancellationToken).ConfigureAwait(false);
 
@@ -995,7 +1031,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Pet"/>&gt;</returns>
-        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Pet> GetPetByIdOrDefaultAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Pet> result = null;
             try 
@@ -1018,6 +1054,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetPetById(long petId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return petId;
         }
 
@@ -1049,7 +1094,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="petId">ID of pet to return</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Pet"/></returns>
-        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Pet>> GetPetByIdWithHttpInfoAsync(long petId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1123,7 +1168,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithHttpInfoAsync(pet, cancellationToken).ConfigureAwait(false);
 
@@ -1140,7 +1185,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetOrDefaultAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetOrDefaultAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1163,6 +1208,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Pet OnUpdatePet(Pet pet)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (pet == null)
+                throw new ArgumentNullException(nameof(pet));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return pet;
         }
 
@@ -1194,7 +1248,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="pet">Pet object that needs to be added to the store</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithHttpInfoAsync(Pet pet, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1287,7 +1341,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await UpdatePetWithFormWithHttpInfoAsync(petId, name, status, cancellationToken).ConfigureAwait(false);
 
@@ -1306,7 +1360,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdatePetWithFormOrDefaultAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -1331,6 +1385,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (long, string, string) OnUpdatePetWithForm(long petId, string name, string status)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (petId, name, status);
         }
 
@@ -1368,7 +1431,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId = null, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdatePetWithFormWithHttpInfoAsync(long petId, string name = null, string status = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1456,13 +1519,13 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1475,16 +1538,16 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileOrDefaultAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithHttpInfoAsync(petId, additionalMetadata, file, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithHttpInfoAsync(petId, file, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1499,12 +1562,21 @@ namespace Org.OpenAPITools.Api
         /// Validates the request parameters
         /// </summary>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
+        /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long, string, System.IO.Stream) OnUploadFile(long petId, string additionalMetadata, System.IO.Stream file)
+        protected virtual (long, System.IO.Stream, string) OnUploadFile(long petId, System.IO.Stream file, string additionalMetadata)
         {
-            return (petId, additionalMetadata, file);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (petId, file, additionalMetadata);
         }
 
         /// <summary>
@@ -1512,9 +1584,9 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <param name="apiResponse"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, string additionalMetadata, System.IO.Stream file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void AfterUploadFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream file, string additionalMetadata)
         {
         }
 
@@ -1525,9 +1597,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
         /// <param name="petId"></param>
-        /// <param name="additionalMetadata"></param>
         /// <param name="file"></param>
-        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, string additionalMetadata, System.IO.Stream file)
+        /// <param name="additionalMetadata"></param>
+        protected virtual void OnErrorUploadFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream file, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1537,20 +1609,20 @@ namespace Org.OpenAPITools.Api
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
         /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId = null, string additionalMetadata = null, System.IO.Stream file = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithHttpInfoAsync(long petId, System.IO.Stream file = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFile(petId, additionalMetadata, file);
+                var validatedParameters = OnUploadFile(petId, file, additionalMetadata);
                 petId = validatedParameters.Item1;
-                additionalMetadata = validatedParameters.Item2;
-                file = validatedParameters.Item3;
+                file = validatedParameters.Item2;
+                additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1565,12 +1637,12 @@ namespace Org.OpenAPITools.Api
 
                     List<KeyValuePair<string, string>> formParams = new List<KeyValuePair<string, string>>();
 
-                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (additionalMetadata != null)
-                        formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
-
-                    if (file != null)
+                    multipartContent.Add(new FormUrlEncodedContent(formParams));                    if (file != null)
                         multipartContent.Add(new StreamContent(file));
 
+                    if (additionalMetadata != null)
+                        formParams.Add(new KeyValuePair<string, string>("additionalMetadata", ClientUtils.ParameterToString(additionalMetadata)));
+
                     List<TokenBase> tokens = new List<TokenBase>();
 
 
@@ -1616,7 +1688,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFile(apiResponse, petId, additionalMetadata, file);
+                            AfterUploadFile(apiResponse, petId, file, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1628,7 +1700,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, additionalMetadata, file);
+                OnErrorUploadFile(e, "/pet/{petId}/uploadImage", uriBuilder.Path, petId, file, additionalMetadata);
                 throw;
             }
         }
@@ -1637,14 +1709,14 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+            ApiResponse<ApiResponse> result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1656,17 +1728,17 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse"/>&gt;</returns>
-        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<ApiResponse> result = null;
             try 
             {
-                result = await UploadFileWithRequiredFileWithHttpInfoAsync(petId, requiredFile, additionalMetadata, cancellationToken).ConfigureAwait(false);
+                result = await UploadFileWithRequiredFileWithHttpInfoAsync(requiredFile, petId, additionalMetadata, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1680,23 +1752,35 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
         /// <returns></returns>
-        protected virtual (long, System.IO.Stream, string) OnUploadFileWithRequiredFile(long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual (System.IO.Stream, long, string) OnUploadFileWithRequiredFile(System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
-            return (petId, requiredFile, additionalMetadata);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (requiredFile == null)
+                throw new ArgumentNullException(nameof(requiredFile));
+
+            if (petId == null)
+                throw new ArgumentNullException(nameof(petId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (requiredFile, petId, additionalMetadata);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual void AfterUploadFileWithRequiredFile(ApiResponse<ApiResponse> apiResponse, System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
         }
 
@@ -1706,10 +1790,10 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="petId"></param>
         /// <param name="requiredFile"></param>
+        /// <param name="petId"></param>
         /// <param name="additionalMetadata"></param>
-        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, long petId, System.IO.Stream requiredFile, string additionalMetadata)
+        protected virtual void OnErrorUploadFileWithRequiredFile(Exception exception, string pathFormat, string path, System.IO.Stream requiredFile, long petId, string additionalMetadata)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1718,20 +1802,20 @@ namespace Org.OpenAPITools.Api
         /// uploads an image (required) 
         /// </summary>
         /// <exception cref="ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
         /// <param name="requiredFile">file to upload</param>
+        /// <param name="petId">ID of pet to update</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="ApiResponse{T}"/>&gt; where T : <see cref="ApiResponse"/></returns>
-        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(long petId = null, System.IO.Stream requiredFile = null, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<ApiResponse>> UploadFileWithRequiredFileWithHttpInfoAsync(System.IO.Stream requiredFile, long petId, string additionalMetadata = null, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
-                petId = validatedParameters.Item1;
-                requiredFile = validatedParameters.Item2;
+                var validatedParameters = OnUploadFileWithRequiredFile(requiredFile, petId, additionalMetadata);
+                requiredFile = validatedParameters.Item1;
+                petId = validatedParameters.Item2;
                 additionalMetadata = validatedParameters.Item3;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
@@ -1798,7 +1882,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<ApiResponse>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUploadFileWithRequiredFile(apiResponse, petId, requiredFile, additionalMetadata);
+                            AfterUploadFileWithRequiredFile(apiResponse, requiredFile, petId, additionalMetadata);
                         }
                         else if (apiResponse.StatusCode == (HttpStatusCode) 429)
                             foreach(TokenBase token in tokens)
@@ -1810,7 +1894,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, petId, requiredFile, additionalMetadata);
+                OnErrorUploadFileWithRequiredFile(e, "/fake/{petId}/uploadImageWithRequiredFile", uriBuilder.Path, requiredFile, petId, additionalMetadata);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
index 3006d290b33..07af6e52b76 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete purchase order by ID
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Returns pet inventories by status
@@ -83,7 +83,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Find purchase order by ID
@@ -95,7 +95,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -107,7 +107,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;Order&gt;&gt;</returns>
-        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Place an order for a pet
@@ -119,7 +119,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;Order&gt;</returns>
-        Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -204,7 +204,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteOrderWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -221,7 +221,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteOrderOrDefaultAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteOrderOrDefaultAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -244,6 +244,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteOrder(string orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -275,7 +284,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteOrderWithHttpInfoAsync(string orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -448,7 +457,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await GetOrderByIdWithHttpInfoAsync(orderId, cancellationToken).ConfigureAwait(false);
 
@@ -465,7 +474,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> GetOrderByIdOrDefaultAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -488,6 +497,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual long OnGetOrderById(long orderId)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (orderId == null)
+                throw new ArgumentNullException(nameof(orderId));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return orderId;
         }
 
@@ -519,7 +537,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> GetOrderByIdWithHttpInfoAsync(long orderId, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -584,7 +602,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = await PlaceOrderWithHttpInfoAsync(order, cancellationToken).ConfigureAwait(false);
 
@@ -601,7 +619,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="Order"/>&gt;</returns>
-        public async Task<Order> PlaceOrderOrDefaultAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<Order> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<Order> result = null;
             try 
@@ -624,6 +642,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual Order OnPlaceOrder(Order order)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (order == null)
+                throw new ArgumentNullException(nameof(order));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return order;
         }
 
@@ -655,7 +682,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="order">order placed for purchasing the pet</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="Order"/></returns>
-        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<Order>> PlaceOrderWithHttpInfoAsync(Order order, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
index 8cd07b7db44..88d04ddaf5d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs
@@ -37,7 +37,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Create user
@@ -49,7 +49,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -73,7 +73,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -85,7 +85,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -97,7 +97,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -109,7 +109,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Delete user
@@ -121,7 +121,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;User&gt;&gt;</returns>
-        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Get user by user name
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;User&gt;</returns>
-        Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -158,7 +158,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;string&gt;&gt;</returns>
-        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs user into the system
@@ -171,7 +171,7 @@ namespace Org.OpenAPITools.IApi
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;string&gt;</returns>
-        Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Logs out current logged in user session
@@ -202,11 +202,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task&lt;ApiResponse&lt;object&gt;&gt;</returns>
-        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
 
         /// <summary>
         /// Updated user
@@ -215,11 +215,11 @@ namespace Org.OpenAPITools.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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse&lt;object&gt;</returns>
-        Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null);
+        Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null);
     }
 }
 
@@ -304,7 +304,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUserWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -321,7 +321,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUserOrDefaultAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUserOrDefaultAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -344,6 +344,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual User OnCreateUser(User user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -375,7 +384,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">Created user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUserWithHttpInfoAsync(User user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -443,7 +452,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithArrayInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -460,7 +469,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithArrayInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -483,6 +492,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithArrayInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -514,7 +532,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithArrayInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -582,7 +600,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await CreateUsersWithListInputWithHttpInfoAsync(user, cancellationToken).ConfigureAwait(false);
 
@@ -599,7 +617,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> CreateUsersWithListInputOrDefaultAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -622,6 +640,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual List<User> OnCreateUsersWithListInput(List<User> user)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return user;
         }
 
@@ -653,7 +680,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="user">List of user object</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> CreateUsersWithListInputWithHttpInfoAsync(List<User> user, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -721,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = await DeleteUserWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -738,7 +765,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> DeleteUserOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> DeleteUserOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
@@ -761,6 +788,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnDeleteUser(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -792,7 +828,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> DeleteUserWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -847,7 +883,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = await GetUserByNameWithHttpInfoAsync(username, cancellationToken).ConfigureAwait(false);
 
@@ -864,7 +900,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="User"/>&gt;</returns>
-        public async Task<User> GetUserByNameOrDefaultAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<User> GetUserByNameOrDefaultAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<User> result = null;
             try 
@@ -887,6 +923,15 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual string OnGetUserByName(string username)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return username;
         }
 
@@ -918,7 +963,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="User"/></returns>
-        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<User>> GetUserByNameWithHttpInfoAsync(string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -984,7 +1029,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="string"/>&gt;</returns>
-        public async Task<string> LoginUserAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<string> LoginUserAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<string> result = await LoginUserWithHttpInfoAsync(username, password, cancellationToken).ConfigureAwait(false);
 
@@ -1004,6 +1049,18 @@ namespace Org.OpenAPITools.Api
         /// <returns></returns>
         protected virtual (string, string) OnLoginUser(string username, string password)
         {
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            if (password == null)
+                throw new ArgumentNullException(nameof(password));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
             return (username, password);
         }
 
@@ -1038,7 +1095,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password">The password for login in clear text</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="string"/></returns>
-        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username = null, string password = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<string>> LoginUserWithHttpInfoAsync(string username, string password, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
@@ -1229,13 +1286,13 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdateUserAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
-            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+            ApiResponse<object> result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
 
             if (result.Content == null)
                 throw new ApiException(result.ReasonPhrase, result.StatusCode, result.RawContent);
@@ -1247,16 +1304,16 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="object"/>&gt;</returns>
-        public async Task<object> UpdateUserOrDefaultAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<object> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             ApiResponse<object> result = null;
             try 
             {
-                result = await UpdateUserWithHttpInfoAsync(username, user, cancellationToken).ConfigureAwait(false);
+                result = await UpdateUserWithHttpInfoAsync(user, username, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
             {
@@ -1270,21 +1327,33 @@ namespace Org.OpenAPITools.Api
         /// <summary>
         /// Validates the request parameters
         /// </summary>
-        /// <param name="username"></param>
         /// <param name="user"></param>
+        /// <param name="username"></param>
         /// <returns></returns>
-        protected virtual (string, User) OnUpdateUser(string username, User user)
+        protected virtual (User, string) OnUpdateUser(User user, string username)
         {
-            return (username, user);
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+
+            #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
+            #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
+
+            return (user, username);
         }
 
         /// <summary>
         /// Processes the server response
         /// </summary>
         /// <param name="apiResponse"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, string username, User user)
+        /// <param name="username"></param>
+        protected virtual void AfterUpdateUser(ApiResponse<object> apiResponse, User user, string username)
         {
         }
 
@@ -1294,9 +1363,9 @@ namespace Org.OpenAPITools.Api
         /// <param name="exception"></param>
         /// <param name="pathFormat"></param>
         /// <param name="path"></param>
-        /// <param name="username"></param>
         /// <param name="user"></param>
-        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, string username, User user)
+        /// <param name="username"></param>
+        protected virtual void OnErrorUpdateUser(Exception exception, string pathFormat, string path, User user, string username)
         {
             Logger.LogError(exception, "An error occurred while sending the request to the server.");
         }
@@ -1305,19 +1374,19 @@ namespace Org.OpenAPITools.Api
         /// 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="username">name that need to be deleted</param>
         /// <param name="user">Updated user object</param>
+        /// <param name="username">name that need to be deleted</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ApiResponse{T}"/>&gt; where T : <see cref="object"/></returns>
-        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(string username = null, User user = null, System.Threading.CancellationToken? cancellationToken = null)
+        public async Task<ApiResponse<object>> UpdateUserWithHttpInfoAsync(User user, string username, System.Threading.CancellationToken? cancellationToken = null)
         {
             UriBuilder uriBuilder = new UriBuilder();
 
             try
             {
-                var validatedParameters = OnUpdateUser(username, user);
-                username = validatedParameters.Item1;
-                user = validatedParameters.Item2;
+                var validatedParameters = OnUpdateUser(user, username);
+                user = validatedParameters.Item1;
+                username = validatedParameters.Item2;
 
                 using (HttpRequestMessage request = new HttpRequestMessage())
                 {
@@ -1358,7 +1427,7 @@ namespace Org.OpenAPITools.Api
                         if (apiResponse.IsSuccessStatusCode)
                         {
                             apiResponse.Content = JsonSerializer.Deserialize<object>(apiResponse.RawContent, _jsonSerializerOptions);
-                            AfterUpdateUser(apiResponse, username, user);
+                            AfterUpdateUser(apiResponse, user, username);
                         }
 
                         return apiResponse;
@@ -1367,7 +1436,7 @@ namespace Org.OpenAPITools.Api
             }
             catch(Exception e)
             {
-                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, username, user);
+                OnErrorUpdateUser(e, "/user/{username}", uriBuilder.Path, user, username);
                 throw;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
index 267679a9928..5682c09e840 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
@@ -31,16 +31,16 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty</param>
+        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapOfMapProperty">mapOfMapProperty</param>
-        /// <param name="anytype1">anytype1</param>
+        /// <param name="mapProperty">mapProperty</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype1">mapWithUndeclaredPropertiesAnytype1</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype2">mapWithUndeclaredPropertiesAnytype2</param>
         /// <param name="mapWithUndeclaredPropertiesAnytype3">mapWithUndeclaredPropertiesAnytype3</param>
-        /// <param name="emptyMap">an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</param>
         /// <param name="mapWithUndeclaredPropertiesString">mapWithUndeclaredPropertiesString</param>
+        /// <param name="anytype1">anytype1</param>
         [JsonConstructor]
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Object anytype1 = default, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Object emptyMap, Dictionary<string, string> mapWithUndeclaredPropertiesString)
+        public AdditionalPropertiesClass(Object emptyMap, Dictionary<string, Dictionary<string, string>> mapOfMapProperty, Dictionary<string, string> mapProperty, Object mapWithUndeclaredPropertiesAnytype1, Object mapWithUndeclaredPropertiesAnytype2, Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3, Dictionary<string, string> mapWithUndeclaredPropertiesString, Object anytype1 = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -69,21 +69,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapProperty = mapProperty;
+            EmptyMap = emptyMap;
             MapOfMapProperty = mapOfMapProperty;
-            Anytype1 = anytype1;
+            MapProperty = mapProperty;
             MapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
             MapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
             MapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
-            EmptyMap = emptyMap;
             MapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
+            Anytype1 = anytype1;
         }
 
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
         /// </summary>
-        [JsonPropertyName("map_property")]
-        public Dictionary<string, string> MapProperty { get; set; }
+        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
+        [JsonPropertyName("empty_map")]
+        public Object EmptyMap { get; set; }
 
         /// <summary>
         /// Gets or Sets MapOfMapProperty
@@ -92,10 +93,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Anytype1
+        /// Gets or Sets MapProperty
         /// </summary>
-        [JsonPropertyName("anytype_1")]
-        public Object Anytype1 { get; set; }
+        [JsonPropertyName("map_property")]
+        public Dictionary<string, string> MapProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesAnytype1
@@ -115,19 +116,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map_with_undeclared_properties_anytype_3")]
         public Dictionary<string, Object> MapWithUndeclaredPropertiesAnytype3 { get; set; }
 
-        /// <summary>
-        /// an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
-        /// </summary>
-        /// <value>an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.</value>
-        [JsonPropertyName("empty_map")]
-        public Object EmptyMap { get; set; }
-
         /// <summary>
         /// Gets or Sets MapWithUndeclaredPropertiesString
         /// </summary>
         [JsonPropertyName("map_with_undeclared_properties_string")]
         public Dictionary<string, string> MapWithUndeclaredPropertiesString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [JsonPropertyName("anytype_1")]
+        public Object Anytype1 { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -142,14 +142,14 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
-            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype1: ").Append(MapWithUndeclaredPropertiesAnytype1).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype2: ").Append(MapWithUndeclaredPropertiesAnytype2).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesAnytype3: ").Append(MapWithUndeclaredPropertiesAnytype3).Append("\n");
-            sb.Append("  EmptyMap: ").Append(EmptyMap).Append("\n");
             sb.Append("  MapWithUndeclaredPropertiesString: ").Append(MapWithUndeclaredPropertiesString).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -187,14 +187,14 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, string> mapProperty = default;
+            Object emptyMap = default;
             Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default;
-            Object anytype1 = default;
+            Dictionary<string, string> mapProperty = default;
             Object mapWithUndeclaredPropertiesAnytype1 = default;
             Object mapWithUndeclaredPropertiesAnytype2 = default;
             Dictionary<string, Object> mapWithUndeclaredPropertiesAnytype3 = default;
-            Object emptyMap = default;
             Dictionary<string, string> mapWithUndeclaredPropertiesString = default;
+            Object anytype1 = default;
 
             while (reader.Read())
             {
@@ -211,14 +211,14 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_property":
-                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
+                        case "empty_map":
+                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "map_of_map_property":
                             mapOfMapProperty = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
                             break;
-                        case "anytype_1":
-                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "map_property":
+                            mapProperty = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
                         case "map_with_undeclared_properties_anytype_1":
                             mapWithUndeclaredPropertiesAnytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -229,19 +229,19 @@ namespace Org.OpenAPITools.Model
                         case "map_with_undeclared_properties_anytype_3":
                             mapWithUndeclaredPropertiesAnytype3 = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "empty_map":
-                            emptyMap = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
                         case "map_with_undeclared_properties_string":
                             mapWithUndeclaredPropertiesString = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
                             break;
+                        case "anytype_1":
+                            anytype1 = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new AdditionalPropertiesClass(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
+            return new AdditionalPropertiesClass(emptyMap, mapOfMapProperty, mapProperty, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, mapWithUndeclaredPropertiesString, anytype1);
         }
 
         /// <summary>
@@ -255,22 +255,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_property");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
+            writer.WritePropertyName("empty_map");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_of_map_property");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapOfMapProperty, options);
-            writer.WritePropertyName("anytype_1");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
+            writer.WritePropertyName("map_property");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.MapProperty, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_1");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype1, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_2");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype2, options);
             writer.WritePropertyName("map_with_undeclared_properties_anytype_3");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesAnytype3, options);
-            writer.WritePropertyName("empty_map");
-            JsonSerializer.Serialize(writer, additionalPropertiesClass.EmptyMap, options);
             writer.WritePropertyName("map_with_undeclared_properties_string");
             JsonSerializer.Serialize(writer, additionalPropertiesClass.MapWithUndeclaredPropertiesString, options);
+            writer.WritePropertyName("anytype_1");
+            JsonSerializer.Serialize(writer, additionalPropertiesClass.Anytype1, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
index 73eee830ea0..3610a2a0bec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs
@@ -32,10 +32,10 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="ApiResponse" /> class.
         /// </summary>
         /// <param name="code">code</param>
-        /// <param name="type">type</param>
         /// <param name="message">message</param>
+        /// <param name="type">type</param>
         [JsonConstructor]
-        public ApiResponse(int code, string type, string message)
+        public ApiResponse(int code, string message, string type)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -53,8 +53,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             Code = code;
-            Type = type;
             Message = message;
+            Type = type;
         }
 
         /// <summary>
@@ -63,18 +63,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("code")]
         public int Code { get; set; }
 
-        /// <summary>
-        /// Gets or Sets Type
-        /// </summary>
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or Sets Message
         /// </summary>
         [JsonPropertyName("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -90,8 +90,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class ApiResponse {\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -130,8 +130,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int code = default;
-            string type = default;
             string message = default;
+            string type = default;
 
             while (reader.Read())
             {
@@ -151,19 +151,19 @@ namespace Org.OpenAPITools.Model
                         case "code":
                             code = reader.GetInt32();
                             break;
-                        case "type":
-                            type = reader.GetString();
-                            break;
                         case "message":
                             message = reader.GetString();
                             break;
+                        case "type":
+                            type = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ApiResponse(code, type, message);
+            return new ApiResponse(code, message, type);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("code", apiResponse.Code);
-            writer.WriteString("type", apiResponse.Type);
             writer.WriteString("message", apiResponse.Message);
+            writer.WriteString("type", apiResponse.Type);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
index d628f7aac0b..ef26590ab3c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
-        /// <param name="arrayOfString">arrayOfString</param>
         /// <param name="arrayArrayOfInteger">arrayArrayOfInteger</param>
         /// <param name="arrayArrayOfModel">arrayArrayOfModel</param>
+        /// <param name="arrayOfString">arrayOfString</param>
         [JsonConstructor]
-        public ArrayTest(List<string> arrayOfString, List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel)
+        public ArrayTest(List<List<long>> arrayArrayOfInteger, List<List<ReadOnlyFirst>> arrayArrayOfModel, List<string> arrayOfString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            ArrayOfString = arrayOfString;
             ArrayArrayOfInteger = arrayArrayOfInteger;
             ArrayArrayOfModel = arrayArrayOfModel;
+            ArrayOfString = arrayOfString;
         }
 
-        /// <summary>
-        /// Gets or Sets ArrayOfString
-        /// </summary>
-        [JsonPropertyName("array_of_string")]
-        public List<string> ArrayOfString { get; set; }
-
         /// <summary>
         /// Gets or Sets ArrayArrayOfInteger
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("array_array_of_model")]
         public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [JsonPropertyName("array_of_string")]
+        public List<string> ArrayOfString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
-            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
             sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            List<string> arrayOfString = default;
             List<List<long>> arrayArrayOfInteger = default;
             List<List<ReadOnlyFirst>> arrayArrayOfModel = default;
+            List<string> arrayOfString = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "array_of_string":
-                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
-                            break;
                         case "array_array_of_integer":
                             arrayArrayOfInteger = JsonSerializer.Deserialize<List<List<long>>>(ref reader, options);
                             break;
                         case "array_array_of_model":
                             arrayArrayOfModel = JsonSerializer.Deserialize<List<List<ReadOnlyFirst>>>(ref reader, options);
                             break;
+                        case "array_of_string":
+                            arrayOfString = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new ArrayTest(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+            return new ArrayTest(arrayArrayOfInteger, arrayArrayOfModel, arrayOfString);
         }
 
         /// <summary>
@@ -177,12 +177,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("array_of_string");
-            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
             writer.WritePropertyName("array_array_of_integer");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfInteger, options);
             writer.WritePropertyName("array_array_of_model");
             JsonSerializer.Serialize(writer, arrayTest.ArrayArrayOfModel, options);
+            writer.WritePropertyName("array_of_string");
+            JsonSerializer.Serialize(writer, arrayTest.ArrayOfString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
index 8cb011aa50c..0d25bc70612 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Capitalization" /> class.
         /// </summary>
-        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="aTTNAME">Name of the pet </param>
         /// <param name="capitalCamel">capitalCamel</param>
-        /// <param name="smallSnake">smallSnake</param>
         /// <param name="capitalSnake">capitalSnake</param>
         /// <param name="sCAETHFlowPoints">sCAETHFlowPoints</param>
-        /// <param name="aTTNAME">Name of the pet </param>
+        /// <param name="smallCamel">smallCamel</param>
+        /// <param name="smallSnake">smallSnake</param>
         [JsonConstructor]
-        public Capitalization(string smallCamel, string capitalCamel, string smallSnake, string capitalSnake, string sCAETHFlowPoints, string aTTNAME)
+        public Capitalization(string aTTNAME, string capitalCamel, string capitalSnake, string sCAETHFlowPoints, string smallCamel, string smallSnake)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,19 +64,20 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SmallCamel = smallCamel;
+            ATT_NAME = aTTNAME;
             CapitalCamel = capitalCamel;
-            SmallSnake = smallSnake;
             CapitalSnake = capitalSnake;
             SCAETHFlowPoints = sCAETHFlowPoints;
-            ATT_NAME = aTTNAME;
+            SmallCamel = smallCamel;
+            SmallSnake = smallSnake;
         }
 
         /// <summary>
-        /// Gets or Sets SmallCamel
+        /// Name of the pet 
         /// </summary>
-        [JsonPropertyName("smallCamel")]
-        public string SmallCamel { get; set; }
+        /// <value>Name of the pet </value>
+        [JsonPropertyName("ATT_NAME")]
+        public string ATT_NAME { get; set; }
 
         /// <summary>
         /// Gets or Sets CapitalCamel
@@ -84,12 +85,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("CapitalCamel")]
         public string CapitalCamel { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SmallSnake
-        /// </summary>
-        [JsonPropertyName("small_Snake")]
-        public string SmallSnake { get; set; }
-
         /// <summary>
         /// Gets or Sets CapitalSnake
         /// </summary>
@@ -103,11 +98,16 @@ namespace Org.OpenAPITools.Model
         public string SCAETHFlowPoints { get; set; }
 
         /// <summary>
-        /// Name of the pet 
+        /// Gets or Sets SmallCamel
         /// </summary>
-        /// <value>Name of the pet </value>
-        [JsonPropertyName("ATT_NAME")]
-        public string ATT_NAME { get; set; }
+        [JsonPropertyName("smallCamel")]
+        public string SmallCamel { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SmallSnake
+        /// </summary>
+        [JsonPropertyName("small_Snake")]
+        public string SmallSnake { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -123,12 +123,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Capitalization {\n");
-            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
             sb.Append("  CapitalCamel: ").Append(CapitalCamel).Append("\n");
-            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  CapitalSnake: ").Append(CapitalSnake).Append("\n");
             sb.Append("  SCAETHFlowPoints: ").Append(SCAETHFlowPoints).Append("\n");
-            sb.Append("  ATT_NAME: ").Append(ATT_NAME).Append("\n");
+            sb.Append("  SmallCamel: ").Append(SmallCamel).Append("\n");
+            sb.Append("  SmallSnake: ").Append(SmallSnake).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -166,12 +166,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string smallCamel = default;
+            string aTTNAME = default;
             string capitalCamel = default;
-            string smallSnake = default;
             string capitalSnake = default;
             string sCAETHFlowPoints = default;
-            string aTTNAME = default;
+            string smallCamel = default;
+            string smallSnake = default;
 
             while (reader.Read())
             {
@@ -188,23 +188,23 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "smallCamel":
-                            smallCamel = reader.GetString();
+                        case "ATT_NAME":
+                            aTTNAME = reader.GetString();
                             break;
                         case "CapitalCamel":
                             capitalCamel = reader.GetString();
                             break;
-                        case "small_Snake":
-                            smallSnake = reader.GetString();
-                            break;
                         case "Capital_Snake":
                             capitalSnake = reader.GetString();
                             break;
                         case "SCA_ETH_Flow_Points":
                             sCAETHFlowPoints = reader.GetString();
                             break;
-                        case "ATT_NAME":
-                            aTTNAME = reader.GetString();
+                        case "smallCamel":
+                            smallCamel = reader.GetString();
+                            break;
+                        case "small_Snake":
+                            smallSnake = reader.GetString();
                             break;
                         default:
                             break;
@@ -212,7 +212,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Capitalization(smallCamel, capitalCamel, smallSnake, capitalSnake, sCAETHFlowPoints, aTTNAME);
+            return new Capitalization(aTTNAME, capitalCamel, capitalSnake, sCAETHFlowPoints, smallCamel, smallSnake);
         }
 
         /// <summary>
@@ -226,12 +226,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
             writer.WriteString("CapitalCamel", capitalization.CapitalCamel);
-            writer.WriteString("small_Snake", capitalization.SmallSnake);
             writer.WriteString("Capital_Snake", capitalization.CapitalSnake);
             writer.WriteString("SCA_ETH_Flow_Points", capitalization.SCAETHFlowPoints);
-            writer.WriteString("ATT_NAME", capitalization.ATT_NAME);
+            writer.WriteString("smallCamel", capitalization.SmallCamel);
+            writer.WriteString("small_Snake", capitalization.SmallSnake);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
index 444fbaaccdb..113fd3d276d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Category" /> class.
         /// </summary>
-        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         /// <param name="id">id</param>
+        /// <param name="name">name (default to &quot;default-name&quot;)</param>
         [JsonConstructor]
-        public Category(string name = "default-name", long id)
+        public Category(long id, string name = "default-name")
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,22 +48,22 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Name = name;
             Id = id;
+            Name = name;
         }
 
-        /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         [JsonPropertyName("id")]
         public long Id { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Category {\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string name = default;
             long id = default;
+            string name = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
                         case "id":
                             id = reader.GetInt64();
                             break;
+                        case "name":
+                            name = reader.GetString();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Category(name, id);
+            return new Category(id, name);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("name", category.Name);
             writer.WriteNumber("id", category.Id);
+            writer.WriteString("name", category.Name);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
index 81fd55bd903..be70d0da28b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ClassModel" /> class.
         /// </summary>
-        /// <param name="_class">_class</param>
+        /// <param name="classProperty">classProperty</param>
         [JsonConstructor]
-        public ClassModel(string _class)
+        public ClassModel(string classProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for ClassModel and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for ClassModel and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Class = _class;
+            ClassProperty = classProperty;
         }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets ClassProperty
         /// </summary>
         [JsonPropertyName("_class")]
-        public string Class { get; set; }
+        public string ClassProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ClassModel {\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _class = default;
+            string classProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "_class":
-                            _class = reader.GetString();
+                            classProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ClassModel(_class);
+            return new ClassModel(classProperty);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("_class", classModel.Class);
+            writer.WriteString("_class", classModel.ClassProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
index 4d107d8d323..6de00f19504 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs
@@ -33,10 +33,10 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="mainShape">mainShape</param>
         /// <param name="shapeOrNull">shapeOrNull</param>
-        /// <param name="nullableShape">nullableShape</param>
         /// <param name="shapes">shapes</param>
+        /// <param name="nullableShape">nullableShape</param>
         [JsonConstructor]
-        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, NullableShape nullableShape = default, List<Shape> shapes) : base()
+        public Drawing(Shape mainShape, ShapeOrNull shapeOrNull, List<Shape> shapes, NullableShape nullableShape = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -55,8 +55,8 @@ namespace Org.OpenAPITools.Model
 
             MainShape = mainShape;
             ShapeOrNull = shapeOrNull;
-            NullableShape = nullableShape;
             Shapes = shapes;
+            NullableShape = nullableShape;
         }
 
         /// <summary>
@@ -71,18 +71,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("shapeOrNull")]
         public ShapeOrNull ShapeOrNull { get; set; }
 
-        /// <summary>
-        /// Gets or Sets NullableShape
-        /// </summary>
-        [JsonPropertyName("nullableShape")]
-        public NullableShape NullableShape { get; set; }
-
         /// <summary>
         /// Gets or Sets Shapes
         /// </summary>
         [JsonPropertyName("shapes")]
         public List<Shape> Shapes { get; set; }
 
+        /// <summary>
+        /// Gets or Sets NullableShape
+        /// </summary>
+        [JsonPropertyName("nullableShape")]
+        public NullableShape NullableShape { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -94,8 +94,8 @@ namespace Org.OpenAPITools.Model
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
             sb.Append("  MainShape: ").Append(MainShape).Append("\n");
             sb.Append("  ShapeOrNull: ").Append(ShapeOrNull).Append("\n");
-            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("  Shapes: ").Append(Shapes).Append("\n");
+            sb.Append("  NullableShape: ").Append(NullableShape).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -134,8 +134,8 @@ namespace Org.OpenAPITools.Model
 
             Shape mainShape = default;
             ShapeOrNull shapeOrNull = default;
-            NullableShape nullableShape = default;
             List<Shape> shapes = default;
+            NullableShape nullableShape = default;
 
             while (reader.Read())
             {
@@ -158,19 +158,19 @@ namespace Org.OpenAPITools.Model
                         case "shapeOrNull":
                             shapeOrNull = JsonSerializer.Deserialize<ShapeOrNull>(ref reader, options);
                             break;
-                        case "nullableShape":
-                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
-                            break;
                         case "shapes":
                             shapes = JsonSerializer.Deserialize<List<Shape>>(ref reader, options);
                             break;
+                        case "nullableShape":
+                            nullableShape = JsonSerializer.Deserialize<NullableShape>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Drawing(mainShape, shapeOrNull, nullableShape, shapes);
+            return new Drawing(mainShape, shapeOrNull, shapes, nullableShape);
         }
 
         /// <summary>
@@ -188,10 +188,10 @@ namespace Org.OpenAPITools.Model
             JsonSerializer.Serialize(writer, drawing.MainShape, options);
             writer.WritePropertyName("shapeOrNull");
             JsonSerializer.Serialize(writer, drawing.ShapeOrNull, options);
-            writer.WritePropertyName("nullableShape");
-            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
             writer.WritePropertyName("shapes");
             JsonSerializer.Serialize(writer, drawing.Shapes, options);
+            writer.WritePropertyName("nullableShape");
+            JsonSerializer.Serialize(writer, drawing.NullableShape, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index 724ee8139bf..c6dcd8b5b24 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
-        /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
+        /// <param name="justSymbol">justSymbol</param>
         [JsonConstructor]
-        public EnumArrays(JustSymbolEnum justSymbol, List<EnumArrays.ArrayEnumEnum> arrayEnum)
+        public EnumArrays(List<EnumArrays.ArrayEnumEnum> arrayEnum, JustSymbolEnum justSymbol)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -48,41 +48,41 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
+            JustSymbol = justSymbol;
         }
 
         /// <summary>
-        /// Defines JustSymbol
+        /// Defines ArrayEnum
         /// </summary>
-        public enum JustSymbolEnum
+        public enum ArrayEnumEnum
         {
             /// <summary>
-            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
+            /// Enum Fish for value: fish
             /// </summary>
-            GreaterThanOrEqualTo = 1,
+            Fish = 1,
 
             /// <summary>
-            /// Enum Dollar for value: $
+            /// Enum Crab for value: crab
             /// </summary>
-            Dollar = 2
+            Crab = 2
 
         }
 
         /// <summary>
-        /// Returns a JustSymbolEnum
+        /// Returns a ArrayEnumEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static JustSymbolEnum JustSymbolEnumFromString(string value)
+        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
         {
-            if (value == ">=")
-                return JustSymbolEnum.GreaterThanOrEqualTo;
+            if (value == "fish")
+                return ArrayEnumEnum.Fish;
 
-            if (value == "$")
-                return JustSymbolEnum.Dollar;
+            if (value == "crab")
+                return ArrayEnumEnum.Crab;
 
-            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
         }
 
         /// <summary>
@@ -91,54 +91,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
+        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
         {
-            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
-                return "&gt;&#x3D;";
+            if (value == ArrayEnumEnum.Fish)
+                return "fish";
 
-            if (value == JustSymbolEnum.Dollar)
-                return "$";
+            if (value == ArrayEnumEnum.Crab)
+                return "crab";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets JustSymbol
-        /// </summary>
-        [JsonPropertyName("just_symbol")]
-        public JustSymbolEnum JustSymbol { get; set; }
-
-        /// <summary>
-        /// Defines ArrayEnum
+        /// Defines JustSymbol
         /// </summary>
-        public enum ArrayEnumEnum
+        public enum JustSymbolEnum
         {
             /// <summary>
-            /// Enum Fish for value: fish
+            /// Enum GreaterThanOrEqualTo for value: &gt;&#x3D;
             /// </summary>
-            Fish = 1,
+            GreaterThanOrEqualTo = 1,
 
             /// <summary>
-            /// Enum Crab for value: crab
+            /// Enum Dollar for value: $
             /// </summary>
-            Crab = 2
+            Dollar = 2
 
         }
 
         /// <summary>
-        /// Returns a ArrayEnumEnum
+        /// Returns a JustSymbolEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static ArrayEnumEnum ArrayEnumEnumFromString(string value)
+        public static JustSymbolEnum JustSymbolEnumFromString(string value)
         {
-            if (value == "fish")
-                return ArrayEnumEnum.Fish;
+            if (value == ">=")
+                return JustSymbolEnum.GreaterThanOrEqualTo;
 
-            if (value == "crab")
-                return ArrayEnumEnum.Crab;
+            if (value == "$")
+                return JustSymbolEnum.Dollar;
 
-            throw new NotImplementedException($"Could not convert value to type ArrayEnumEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type JustSymbolEnum: '{value}'");
         }
 
         /// <summary>
@@ -147,17 +141,23 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string ArrayEnumEnumToJsonValue(ArrayEnumEnum value)
+        public static string JustSymbolEnumToJsonValue(JustSymbolEnum value)
         {
-            if (value == ArrayEnumEnum.Fish)
-                return "fish";
+            if (value == JustSymbolEnum.GreaterThanOrEqualTo)
+                return "&gt;&#x3D;";
 
-            if (value == ArrayEnumEnum.Crab)
-                return "crab";
+            if (value == JustSymbolEnum.Dollar)
+                return "$";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
+        /// <summary>
+        /// Gets or Sets JustSymbol
+        /// </summary>
+        [JsonPropertyName("just_symbol")]
+        public JustSymbolEnum JustSymbol { get; set; }
+
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
@@ -178,8 +178,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumArrays {\n");
-            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  ArrayEnum: ").Append(ArrayEnum).Append("\n");
+            sb.Append("  JustSymbol: ").Append(JustSymbol).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -217,8 +217,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumArrays.JustSymbolEnum justSymbol = default;
             List<EnumArrays.ArrayEnumEnum> arrayEnum = default;
+            EnumArrays.JustSymbolEnum justSymbol = default;
 
             while (reader.Read())
             {
@@ -235,20 +235,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "array_enum":
+                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
+                            break;
                         case "just_symbol":
                             string justSymbolRawValue = reader.GetString();
                             justSymbol = EnumArrays.JustSymbolEnumFromString(justSymbolRawValue);
                             break;
-                        case "array_enum":
-                            arrayEnum = JsonSerializer.Deserialize<List<EnumArrays.ArrayEnumEnum>>(ref reader, options);
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumArrays(justSymbol, arrayEnum);
+            return new EnumArrays(arrayEnum, justSymbol);
         }
 
         /// <summary>
@@ -262,13 +262,13 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("array_enum");
+            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
             var justSymbolRawValue = EnumArrays.JustSymbolEnumToJsonValue(enumArrays.JustSymbol);
             if (justSymbolRawValue != null)
                 writer.WriteString("just_symbol", justSymbolRawValue);
             else
                 writer.WriteNull("just_symbol");
-            writer.WritePropertyName("array_enum");
-            JsonSerializer.Serialize(writer, enumArrays.ArrayEnum, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 530cc907a07..9c13e1739d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -31,17 +31,17 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// </summary>
-        /// <param name="enumStringRequired">enumStringRequired</param>
-        /// <param name="enumString">enumString</param>
         /// <param name="enumInteger">enumInteger</param>
         /// <param name="enumIntegerOnly">enumIntegerOnly</param>
         /// <param name="enumNumber">enumNumber</param>
-        /// <param name="outerEnum">outerEnum</param>
-        /// <param name="outerEnumInteger">outerEnumInteger</param>
+        /// <param name="enumString">enumString</param>
+        /// <param name="enumStringRequired">enumStringRequired</param>
         /// <param name="outerEnumDefaultValue">outerEnumDefaultValue</param>
+        /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
+        /// <param name="outerEnum">outerEnum</param>
         [JsonConstructor]
-        public EnumTest(EnumStringRequiredEnum enumStringRequired, EnumStringEnum enumString, EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, OuterEnum? outerEnum = default, OuterEnumInteger outerEnumInteger, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
+        public EnumTest(EnumIntegerEnum enumInteger, EnumIntegerOnlyEnum enumIntegerOnly, EnumNumberEnum enumNumber, EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, OuterEnumDefaultValue outerEnumDefaultValue, OuterEnumInteger outerEnumInteger, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, OuterEnum? outerEnum = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -73,56 +73,48 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            EnumStringRequired = enumStringRequired;
-            EnumString = enumString;
             EnumInteger = enumInteger;
             EnumIntegerOnly = enumIntegerOnly;
             EnumNumber = enumNumber;
-            OuterEnum = outerEnum;
-            OuterEnumInteger = outerEnumInteger;
+            EnumString = enumString;
+            EnumStringRequired = enumStringRequired;
             OuterEnumDefaultValue = outerEnumDefaultValue;
+            OuterEnumInteger = outerEnumInteger;
             OuterEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
+            OuterEnum = outerEnum;
         }
 
         /// <summary>
-        /// Defines EnumStringRequired
+        /// Defines EnumInteger
         /// </summary>
-        public enum EnumStringRequiredEnum
+        public enum EnumIntegerEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_1 for value: 1
             /// </summary>
-            Lower = 2,
+            NUMBER_1 = 1,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_1 for value: -1
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_1 = -1
 
         }
 
         /// <summary>
-        /// Returns a EnumStringRequiredEnum
+        /// Returns a EnumIntegerEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
+        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringRequiredEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringRequiredEnum.Lower;
+            if (value == (1).ToString())
+                return EnumIntegerEnum.NUMBER_1;
 
-            if (value == "")
-                return EnumStringRequiredEnum.Empty;
+            if (value == (-1).ToString())
+                return EnumIntegerEnum.NUMBER_MINUS_1;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
         }
 
         /// <summary>
@@ -131,65 +123,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
+        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
         {
-            if (value == EnumStringRequiredEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringRequiredEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringRequiredEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumStringRequired
+        /// Gets or Sets EnumInteger
         /// </summary>
-        [JsonPropertyName("enum_string_required")]
-        public EnumStringRequiredEnum EnumStringRequired { get; set; }
+        [JsonPropertyName("enum_integer")]
+        public EnumIntegerEnum EnumInteger { get; set; }
 
         /// <summary>
-        /// Defines EnumString
+        /// Defines EnumIntegerOnly
         /// </summary>
-        public enum EnumStringEnum
+        public enum EnumIntegerOnlyEnum
         {
             /// <summary>
-            /// Enum UPPER for value: UPPER
-            /// </summary>
-            UPPER = 1,
-
-            /// <summary>
-            /// Enum Lower for value: lower
+            /// Enum NUMBER_2 for value: 2
             /// </summary>
-            Lower = 2,
+            NUMBER_2 = 2,
 
             /// <summary>
-            /// Enum Empty for value: 
+            /// Enum NUMBER_MINUS_2 for value: -2
             /// </summary>
-            Empty = 3
+            NUMBER_MINUS_2 = -2
 
         }
 
         /// <summary>
-        /// Returns a EnumStringEnum
+        /// Returns a EnumIntegerOnlyEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumStringEnum EnumStringEnumFromString(string value)
+        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
         {
-            if (value == "UPPER")
-                return EnumStringEnum.UPPER;
-
-            if (value == "lower")
-                return EnumStringEnum.Lower;
+            if (value == (2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_2;
 
-            if (value == "")
-                return EnumStringEnum.Empty;
+            if (value == (-2).ToString())
+                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
         }
 
         /// <summary>
@@ -198,57 +173,48 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
+        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
         {
-            if (value == EnumStringEnum.UPPER)
-                return "UPPER";
-
-            if (value == EnumStringEnum.Lower)
-                return "lower";
-
-            if (value == EnumStringEnum.Empty)
-                return "";
-
-            throw new NotImplementedException($"Value could not be handled: '{value}'");
+            return (int) value;
         }
 
         /// <summary>
-        /// Gets or Sets EnumString
+        /// Gets or Sets EnumIntegerOnly
         /// </summary>
-        [JsonPropertyName("enum_string")]
-        public EnumStringEnum EnumString { get; set; }
+        [JsonPropertyName("enum_integer_only")]
+        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
 
         /// <summary>
-        /// Defines EnumInteger
+        /// Defines EnumNumber
         /// </summary>
-        public enum EnumIntegerEnum
+        public enum EnumNumberEnum
         {
             /// <summary>
-            /// Enum NUMBER_1 for value: 1
+            /// Enum NUMBER_1_DOT_1 for value: 1.1
             /// </summary>
-            NUMBER_1 = 1,
+            NUMBER_1_DOT_1 = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1 for value: -1
+            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
             /// </summary>
-            NUMBER_MINUS_1 = -1
+            NUMBER_MINUS_1_DOT_2 = 2
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerEnum
+        /// Returns a EnumNumberEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerEnum EnumIntegerEnumFromString(string value)
+        public static EnumNumberEnum EnumNumberEnumFromString(string value)
         {
-            if (value == (1).ToString())
-                return EnumIntegerEnum.NUMBER_1;
+            if (value == "1.1")
+                return EnumNumberEnum.NUMBER_1_DOT_1;
 
-            if (value == (-1).ToString())
-                return EnumIntegerEnum.NUMBER_MINUS_1;
+            if (value == "-1.2")
+                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerEnum: '{value}'");
+            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
         }
 
         /// <summary>
@@ -257,48 +223,62 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerEnumToJsonValue(EnumIntegerEnum value)
+        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
         {
-            return (int) value;
+            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
+                return 1.1;
+
+            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
+                return -1.2;
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumInteger
+        /// Gets or Sets EnumNumber
         /// </summary>
-        [JsonPropertyName("enum_integer")]
-        public EnumIntegerEnum EnumInteger { get; set; }
+        [JsonPropertyName("enum_number")]
+        public EnumNumberEnum EnumNumber { get; set; }
 
         /// <summary>
-        /// Defines EnumIntegerOnly
+        /// Defines EnumString
         /// </summary>
-        public enum EnumIntegerOnlyEnum
+        public enum EnumStringEnum
         {
             /// <summary>
-            /// Enum NUMBER_2 for value: 2
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_2 = 2,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_2 for value: -2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_2 = -2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumIntegerOnlyEnum
+        /// Returns a EnumStringEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumIntegerOnlyEnum EnumIntegerOnlyEnumFromString(string value)
+        public static EnumStringEnum EnumStringEnumFromString(string value)
         {
-            if (value == (2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_2;
+            if (value == "UPPER")
+                return EnumStringEnum.UPPER;
 
-            if (value == (-2).ToString())
-                return EnumIntegerOnlyEnum.NUMBER_MINUS_2;
+            if (value == "lower")
+                return EnumStringEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumIntegerOnlyEnum: '{value}'");
+            if (value == "")
+                return EnumStringEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringEnum: '{value}'");
         }
 
         /// <summary>
@@ -307,48 +287,65 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static int EnumIntegerOnlyEnumToJsonValue(EnumIntegerOnlyEnum value)
+        public static string EnumStringEnumToJsonValue(EnumStringEnum value)
         {
-            return (int) value;
+            if (value == EnumStringEnum.UPPER)
+                return "UPPER";
+
+            if (value == EnumStringEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringEnum.Empty)
+                return "";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumIntegerOnly
+        /// Gets or Sets EnumString
         /// </summary>
-        [JsonPropertyName("enum_integer_only")]
-        public EnumIntegerOnlyEnum EnumIntegerOnly { get; set; }
+        [JsonPropertyName("enum_string")]
+        public EnumStringEnum EnumString { get; set; }
 
         /// <summary>
-        /// Defines EnumNumber
+        /// Defines EnumStringRequired
         /// </summary>
-        public enum EnumNumberEnum
+        public enum EnumStringRequiredEnum
         {
             /// <summary>
-            /// Enum NUMBER_1_DOT_1 for value: 1.1
+            /// Enum UPPER for value: UPPER
             /// </summary>
-            NUMBER_1_DOT_1 = 1,
+            UPPER = 1,
 
             /// <summary>
-            /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+            /// Enum Lower for value: lower
             /// </summary>
-            NUMBER_MINUS_1_DOT_2 = 2
+            Lower = 2,
+
+            /// <summary>
+            /// Enum Empty for value: 
+            /// </summary>
+            Empty = 3
 
         }
 
         /// <summary>
-        /// Returns a EnumNumberEnum
+        /// Returns a EnumStringRequiredEnum
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static EnumNumberEnum EnumNumberEnumFromString(string value)
+        public static EnumStringRequiredEnum EnumStringRequiredEnumFromString(string value)
         {
-            if (value == "1.1")
-                return EnumNumberEnum.NUMBER_1_DOT_1;
+            if (value == "UPPER")
+                return EnumStringRequiredEnum.UPPER;
 
-            if (value == "-1.2")
-                return EnumNumberEnum.NUMBER_MINUS_1_DOT_2;
+            if (value == "lower")
+                return EnumStringRequiredEnum.Lower;
 
-            throw new NotImplementedException($"Could not convert value to type EnumNumberEnum: '{value}'");
+            if (value == "")
+                return EnumStringRequiredEnum.Empty;
+
+            throw new NotImplementedException($"Could not convert value to type EnumStringRequiredEnum: '{value}'");
         }
 
         /// <summary>
@@ -357,28 +354,31 @@ namespace Org.OpenAPITools.Model
         /// <param name="value"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public static double EnumNumberEnumToJsonValue(EnumNumberEnum value)
+        public static string EnumStringRequiredEnumToJsonValue(EnumStringRequiredEnum value)
         {
-            if (value == EnumNumberEnum.NUMBER_1_DOT_1)
-                return 1.1;
+            if (value == EnumStringRequiredEnum.UPPER)
+                return "UPPER";
 
-            if (value == EnumNumberEnum.NUMBER_MINUS_1_DOT_2)
-                return -1.2;
+            if (value == EnumStringRequiredEnum.Lower)
+                return "lower";
+
+            if (value == EnumStringRequiredEnum.Empty)
+                return "";
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
         /// <summary>
-        /// Gets or Sets EnumNumber
+        /// Gets or Sets EnumStringRequired
         /// </summary>
-        [JsonPropertyName("enum_number")]
-        public EnumNumberEnum EnumNumber { get; set; }
+        [JsonPropertyName("enum_string_required")]
+        public EnumStringRequiredEnum EnumStringRequired { get; set; }
 
         /// <summary>
-        /// Gets or Sets OuterEnum
+        /// Gets or Sets OuterEnumDefaultValue
         /// </summary>
-        [JsonPropertyName("outerEnum")]
-        public OuterEnum? OuterEnum { get; set; }
+        [JsonPropertyName("outerEnumDefaultValue")]
+        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
 
         /// <summary>
         /// Gets or Sets OuterEnumInteger
@@ -386,18 +386,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("outerEnumInteger")]
         public OuterEnumInteger OuterEnumInteger { get; set; }
 
-        /// <summary>
-        /// Gets or Sets OuterEnumDefaultValue
-        /// </summary>
-        [JsonPropertyName("outerEnumDefaultValue")]
-        public OuterEnumDefaultValue OuterEnumDefaultValue { get; set; }
-
         /// <summary>
         /// Gets or Sets OuterEnumIntegerDefaultValue
         /// </summary>
         [JsonPropertyName("outerEnumIntegerDefaultValue")]
         public OuterEnumIntegerDefaultValue OuterEnumIntegerDefaultValue { get; set; }
 
+        /// <summary>
+        /// Gets or Sets OuterEnum
+        /// </summary>
+        [JsonPropertyName("outerEnum")]
+        public OuterEnum? OuterEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -412,15 +412,15 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class EnumTest {\n");
-            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
-            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
             sb.Append("  EnumInteger: ").Append(EnumInteger).Append("\n");
             sb.Append("  EnumIntegerOnly: ").Append(EnumIntegerOnly).Append("\n");
             sb.Append("  EnumNumber: ").Append(EnumNumber).Append("\n");
-            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
-            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
+            sb.Append("  EnumString: ").Append(EnumString).Append("\n");
+            sb.Append("  EnumStringRequired: ").Append(EnumStringRequired).Append("\n");
             sb.Append("  OuterEnumDefaultValue: ").Append(OuterEnumDefaultValue).Append("\n");
+            sb.Append("  OuterEnumInteger: ").Append(OuterEnumInteger).Append("\n");
             sb.Append("  OuterEnumIntegerDefaultValue: ").Append(OuterEnumIntegerDefaultValue).Append("\n");
+            sb.Append("  OuterEnum: ").Append(OuterEnum).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -458,15 +458,15 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
-            EnumTest.EnumStringEnum enumString = default;
             EnumTest.EnumIntegerEnum enumInteger = default;
             EnumTest.EnumIntegerOnlyEnum enumIntegerOnly = default;
             EnumTest.EnumNumberEnum enumNumber = default;
-            OuterEnum? outerEnum = default;
-            OuterEnumInteger outerEnumInteger = default;
+            EnumTest.EnumStringEnum enumString = default;
+            EnumTest.EnumStringRequiredEnum enumStringRequired = default;
             OuterEnumDefaultValue outerEnumDefaultValue = default;
+            OuterEnumInteger outerEnumInteger = default;
             OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = default;
+            OuterEnum? outerEnum = default;
 
             while (reader.Read())
             {
@@ -483,14 +483,6 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "enum_string_required":
-                            string enumStringRequiredRawValue = reader.GetString();
-                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
-                            break;
-                        case "enum_string":
-                            string enumStringRawValue = reader.GetString();
-                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
-                            break;
                         case "enum_integer":
                             enumInteger = (EnumTest.EnumIntegerEnum) reader.GetInt32();
                             break;
@@ -500,29 +492,37 @@ namespace Org.OpenAPITools.Model
                         case "enum_number":
                             enumNumber = (EnumTest.EnumNumberEnum) reader.GetInt32();
                             break;
-                        case "outerEnum":
-                            string outerEnumRawValue = reader.GetString();
-                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                        case "enum_string":
+                            string enumStringRawValue = reader.GetString();
+                            enumString = EnumTest.EnumStringEnumFromString(enumStringRawValue);
                             break;
-                        case "outerEnumInteger":
-                            string outerEnumIntegerRawValue = reader.GetString();
-                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                        case "enum_string_required":
+                            string enumStringRequiredRawValue = reader.GetString();
+                            enumStringRequired = EnumTest.EnumStringRequiredEnumFromString(enumStringRequiredRawValue);
                             break;
                         case "outerEnumDefaultValue":
                             string outerEnumDefaultValueRawValue = reader.GetString();
                             outerEnumDefaultValue = OuterEnumDefaultValueConverter.FromString(outerEnumDefaultValueRawValue);
                             break;
+                        case "outerEnumInteger":
+                            string outerEnumIntegerRawValue = reader.GetString();
+                            outerEnumInteger = OuterEnumIntegerConverter.FromString(outerEnumIntegerRawValue);
+                            break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = reader.GetString();
                             outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValueConverter.FromString(outerEnumIntegerDefaultValueRawValue);
                             break;
+                        case "outerEnum":
+                            string outerEnumRawValue = reader.GetString();
+                            outerEnum = OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new EnumTest(enumStringRequired, enumString, enumInteger, enumIntegerOnly, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
+            return new EnumTest(enumInteger, enumIntegerOnly, enumNumber, enumString, enumStringRequired, outerEnumDefaultValue, outerEnumInteger, outerEnumIntegerDefaultValue, outerEnum);
         }
 
         /// <summary>
@@ -536,41 +536,41 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
-            if (enumStringRequiredRawValue != null)
-                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
-            else
-                writer.WriteNull("enum_string_required");
+            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
+            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
+            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
             var enumStringRawValue = EnumTest.EnumStringEnumToJsonValue(enumTest.EnumString);
             if (enumStringRawValue != null)
                 writer.WriteString("enum_string", enumStringRawValue);
             else
                 writer.WriteNull("enum_string");
-            writer.WriteNumber("enum_integer", EnumTest.EnumIntegerEnumToJsonValue(enumTest.EnumInteger));
-            writer.WriteNumber("enum_integer_only", EnumTest.EnumIntegerOnlyEnumToJsonValue(enumTest.EnumIntegerOnly));
-            writer.WriteNumber("enum_number", EnumTest.EnumNumberEnumToJsonValue(enumTest.EnumNumber));
-            if (enumTest.OuterEnum == null)
-                writer.WriteNull("outerEnum");
-            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
-            if (outerEnumRawValue != null)
-                writer.WriteString("outerEnum", outerEnumRawValue);
-            else
-                writer.WriteNull("outerEnum");
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
-            if (outerEnumIntegerRawValue != null)
-                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            var enumStringRequiredRawValue = EnumTest.EnumStringRequiredEnumToJsonValue(enumTest.EnumStringRequired);
+            if (enumStringRequiredRawValue != null)
+                writer.WriteString("enum_string_required", enumStringRequiredRawValue);
             else
-                writer.WriteNull("outerEnumInteger");
+                writer.WriteNull("enum_string_required");
             var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
+            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            if (outerEnumIntegerRawValue != null)
+                writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
+            else
+                writer.WriteNull("outerEnumInteger");
             var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             if (outerEnumIntegerDefaultValueRawValue != null)
                 writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumIntegerDefaultValue");
+            if (enumTest.OuterEnum == null)
+                writer.WriteNull("outerEnum");
+            var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+            if (outerEnumRawValue != null)
+                writer.WriteString("outerEnum", outerEnumRawValue);
+            else
+                writer.WriteNull("outerEnum");
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
index bf0b8bec3f0..a17a59ac541 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FooGetDefaultResponse" /> class.
         /// </summary>
-        /// <param name="_string">_string</param>
+        /// <param name="stringProperty">stringProperty</param>
         [JsonConstructor]
-        public FooGetDefaultResponse(Foo _string)
+        public FooGetDefaultResponse(Foo stringProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FooGetDefaultResponse and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FooGetDefaultResponse and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            String = _string;
+            StringProperty = stringProperty;
         }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets StringProperty
         /// </summary>
         [JsonPropertyName("string")]
-        public Foo String { get; set; }
+        public Foo StringProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FooGetDefaultResponse {\n");
-            sb.Append("  String: ").Append(String).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Foo _string = default;
+            Foo stringProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "string":
-                            _string = JsonSerializer.Deserialize<Foo>(ref reader, options);
+                            stringProperty = JsonSerializer.Deserialize<Foo>(ref reader, options);
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new FooGetDefaultResponse(_string);
+            return new FooGetDefaultResponse(stringProperty);
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WritePropertyName("string");
-            JsonSerializer.Serialize(writer, fooGetDefaultResponse.String, options);
+            JsonSerializer.Serialize(writer, fooGetDefaultResponse.StringProperty, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
index d0dd73bfe2e..3b28c9e5a5c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -31,24 +31,24 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatTest" /> class.
         /// </summary>
-        /// <param name="number">number</param>
-        /// <param name="_byte">_byte</param>
+        /// <param name="binary">binary</param>
+        /// <param name="byteProperty">byteProperty</param>
         /// <param name="date">date</param>
-        /// <param name="password">password</param>
-        /// <param name="integer">integer</param>
+        /// <param name="dateTime">dateTime</param>
+        /// <param name="decimalProperty">decimalProperty</param>
+        /// <param name="doubleProperty">doubleProperty</param>
+        /// <param name="floatProperty">floatProperty</param>
         /// <param name="int32">int32</param>
         /// <param name="int64">int64</param>
-        /// <param name="_float">_float</param>
-        /// <param name="_double">_double</param>
-        /// <param name="_decimal">_decimal</param>
-        /// <param name="_string">_string</param>
-        /// <param name="binary">binary</param>
-        /// <param name="dateTime">dateTime</param>
-        /// <param name="uuid">uuid</param>
+        /// <param name="integer">integer</param>
+        /// <param name="number">number</param>
+        /// <param name="password">password</param>
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros.</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.</param>
+        /// <param name="stringProperty">stringProperty</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(decimal number, byte[] _byte, DateTime date, string password, int integer, int int32, long int64, float _float, double _double, decimal _decimal, string _string, System.IO.Stream binary, DateTime dateTime, Guid uuid, string patternWithDigits, string patternWithDigitsAndDelimiter)
+        public FormatTest(System.IO.Stream binary, byte[] byteProperty, DateTime date, DateTime dateTime, decimal decimalProperty, double doubleProperty, float floatProperty, int int32, long int64, int integer, decimal number, string password, string patternWithDigits, string patternWithDigitsAndDelimiter, string stringProperty, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -65,20 +65,20 @@ namespace Org.OpenAPITools.Model
             if (number == null)
                 throw new ArgumentNullException("number is a required property for FormatTest and cannot be null.");
 
-            if (_float == null)
-                throw new ArgumentNullException("_float is a required property for FormatTest and cannot be null.");
+            if (floatProperty == null)
+                throw new ArgumentNullException("floatProperty is a required property for FormatTest and cannot be null.");
 
-            if (_double == null)
-                throw new ArgumentNullException("_double is a required property for FormatTest and cannot be null.");
+            if (doubleProperty == null)
+                throw new ArgumentNullException("doubleProperty is a required property for FormatTest and cannot be null.");
 
-            if (_decimal == null)
-                throw new ArgumentNullException("_decimal is a required property for FormatTest and cannot be null.");
+            if (decimalProperty == null)
+                throw new ArgumentNullException("decimalProperty is a required property for FormatTest and cannot be null.");
 
-            if (_string == null)
-                throw new ArgumentNullException("_string is a required property for FormatTest and cannot be null.");
+            if (stringProperty == null)
+                throw new ArgumentNullException("stringProperty is a required property for FormatTest and cannot be null.");
 
-            if (_byte == null)
-                throw new ArgumentNullException("_byte is a required property for FormatTest and cannot be null.");
+            if (byteProperty == null)
+                throw new ArgumentNullException("byteProperty is a required property for FormatTest and cannot be null.");
 
             if (binary == null)
                 throw new ArgumentNullException("binary is a required property for FormatTest and cannot be null.");
@@ -104,35 +104,35 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Number = number;
-            Byte = _byte;
+            Binary = binary;
+            ByteProperty = byteProperty;
             Date = date;
-            Password = password;
-            Integer = integer;
+            DateTime = dateTime;
+            DecimalProperty = decimalProperty;
+            DoubleProperty = doubleProperty;
+            FloatProperty = floatProperty;
             Int32 = int32;
             Int64 = int64;
-            Float = _float;
-            Double = _double;
-            Decimal = _decimal;
-            String = _string;
-            Binary = binary;
-            DateTime = dateTime;
-            Uuid = uuid;
+            Integer = integer;
+            Number = number;
+            Password = password;
             PatternWithDigits = patternWithDigits;
             PatternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
+            StringProperty = stringProperty;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Number
+        /// Gets or Sets Binary
         /// </summary>
-        [JsonPropertyName("number")]
-        public decimal Number { get; set; }
+        [JsonPropertyName("binary")]
+        public System.IO.Stream Binary { get; set; }
 
         /// <summary>
-        /// Gets or Sets Byte
+        /// Gets or Sets ByteProperty
         /// </summary>
         [JsonPropertyName("byte")]
-        public byte[] Byte { get; set; }
+        public byte[] ByteProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets Date
@@ -141,70 +141,58 @@ namespace Org.OpenAPITools.Model
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets or Sets Password
+        /// Gets or Sets DateTime
         /// </summary>
-        [JsonPropertyName("password")]
-        public string Password { get; set; }
+        [JsonPropertyName("dateTime")]
+        public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets or Sets Integer
+        /// Gets or Sets DecimalProperty
         /// </summary>
-        [JsonPropertyName("integer")]
-        public int Integer { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Int32
-        /// </summary>
-        [JsonPropertyName("int32")]
-        public int Int32 { get; set; }
+        [JsonPropertyName("decimal")]
+        public decimal DecimalProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Int64
+        /// Gets or Sets DoubleProperty
         /// </summary>
-        [JsonPropertyName("int64")]
-        public long Int64 { get; set; }
+        [JsonPropertyName("double")]
+        public double DoubleProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Float
+        /// Gets or Sets FloatProperty
         /// </summary>
         [JsonPropertyName("float")]
-        public float Float { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Double
-        /// </summary>
-        [JsonPropertyName("double")]
-        public double Double { get; set; }
+        public float FloatProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Decimal
+        /// Gets or Sets Int32
         /// </summary>
-        [JsonPropertyName("decimal")]
-        public decimal Decimal { get; set; }
+        [JsonPropertyName("int32")]
+        public int Int32 { get; set; }
 
         /// <summary>
-        /// Gets or Sets String
+        /// Gets or Sets Int64
         /// </summary>
-        [JsonPropertyName("string")]
-        public string String { get; set; }
+        [JsonPropertyName("int64")]
+        public long Int64 { get; set; }
 
         /// <summary>
-        /// Gets or Sets Binary
+        /// Gets or Sets Integer
         /// </summary>
-        [JsonPropertyName("binary")]
-        public System.IO.Stream Binary { get; set; }
+        [JsonPropertyName("integer")]
+        public int Integer { get; set; }
 
         /// <summary>
-        /// Gets or Sets DateTime
+        /// Gets or Sets Number
         /// </summary>
-        [JsonPropertyName("dateTime")]
-        public DateTime DateTime { get; set; }
+        [JsonPropertyName("number")]
+        public decimal Number { get; set; }
 
         /// <summary>
-        /// Gets or Sets Uuid
+        /// Gets or Sets Password
         /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
+        [JsonPropertyName("password")]
+        public string Password { get; set; }
 
         /// <summary>
         /// A string that is a 10 digit number. Can have leading zeros.
@@ -220,6 +208,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("pattern_with_digits_and_delimiter")]
         public string PatternWithDigitsAndDelimiter { get; set; }
 
+        /// <summary>
+        /// Gets or Sets StringProperty
+        /// </summary>
+        [JsonPropertyName("string")]
+        public string StringProperty { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -234,22 +234,22 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
-            sb.Append("  Number: ").Append(Number).Append("\n");
-            sb.Append("  Byte: ").Append(Byte).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  ByteProperty: ").Append(ByteProperty).Append("\n");
             sb.Append("  Date: ").Append(Date).Append("\n");
-            sb.Append("  Password: ").Append(Password).Append("\n");
-            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  DecimalProperty: ").Append(DecimalProperty).Append("\n");
+            sb.Append("  DoubleProperty: ").Append(DoubleProperty).Append("\n");
+            sb.Append("  FloatProperty: ").Append(FloatProperty).Append("\n");
             sb.Append("  Int32: ").Append(Int32).Append("\n");
             sb.Append("  Int64: ").Append(Int64).Append("\n");
-            sb.Append("  Float: ").Append(Float).Append("\n");
-            sb.Append("  Double: ").Append(Double).Append("\n");
-            sb.Append("  Decimal: ").Append(Decimal).Append("\n");
-            sb.Append("  String: ").Append(String).Append("\n");
-            sb.Append("  Binary: ").Append(Binary).Append("\n");
-            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
+            sb.Append("  Integer: ").Append(Integer).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  PatternWithDigits: ").Append(PatternWithDigits).Append("\n");
             sb.Append("  PatternWithDigitsAndDelimiter: ").Append(PatternWithDigitsAndDelimiter).Append("\n");
+            sb.Append("  StringProperty: ").Append(StringProperty).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -261,40 +261,28 @@ namespace Org.OpenAPITools.Model
         /// <returns>Validation Result</returns>
         public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
         {
-            // Number (decimal) maximum
-            if (this.Number > (decimal)543.2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
-            }
-
-            // Number (decimal) minimum
-            if (this.Number < (decimal)32.1)
+            // DoubleProperty (double) maximum
+            if (this.DoubleProperty > (double)123.4)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
-            }
-
-            // Password (string) maxLength
-            if (this.Password != null && this.Password.Length > 64)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value less than or equal to 123.4.", new [] { "DoubleProperty" });
             }
 
-            // Password (string) minLength
-            if (this.Password != null && this.Password.Length < 10)
+            // DoubleProperty (double) minimum
+            if (this.DoubleProperty < (double)67.8)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for DoubleProperty, must be a value greater than or equal to 67.8.", new [] { "DoubleProperty" });
             }
 
-            // Integer (int) maximum
-            if (this.Integer > (int)100)
+            // FloatProperty (float) maximum
+            if (this.FloatProperty > (float)987.6)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value less than or equal to 987.6.", new [] { "FloatProperty" });
             }
 
-            // Integer (int) minimum
-            if (this.Integer < (int)10)
+            // FloatProperty (float) minimum
+            if (this.FloatProperty < (float)54.3)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FloatProperty, must be a value greater than or equal to 54.3.", new [] { "FloatProperty" });
             }
 
             // Int32 (int) maximum
@@ -309,35 +297,40 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Int32, must be a value greater than or equal to 20.", new [] { "Int32" });
             }
 
-            // Float (float) maximum
-            if (this.Float > (float)987.6)
+            // Integer (int) maximum
+            if (this.Integer > (int)100)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value less than or equal to 987.6.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value less than or equal to 100.", new [] { "Integer" });
             }
 
-            // Float (float) minimum
-            if (this.Float < (float)54.3)
+            // Integer (int) minimum
+            if (this.Integer < (int)10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Float, must be a value greater than or equal to 54.3.", new [] { "Float" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Integer, must be a value greater than or equal to 10.", new [] { "Integer" });
             }
 
-            // Double (double) maximum
-            if (this.Double > (double)123.4)
+            // Number (decimal) maximum
+            if (this.Number > (decimal)543.2)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value less than or equal to 123.4.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value less than or equal to 543.2.", new [] { "Number" });
             }
 
-            // Double (double) minimum
-            if (this.Double < (double)67.8)
+            // Number (decimal) minimum
+            if (this.Number < (decimal)32.1)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Double, must be a value greater than or equal to 67.8.", new [] { "Double" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Number, must be a value greater than or equal to 32.1.", new [] { "Number" });
             }
 
-            // String (string) pattern
-            Regex regexString = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
-            if (false == regexString.Match(this.String).Success)
+            // Password (string) maxLength
+            if (this.Password != null && this.Password.Length > 64)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be less than 64.", new [] { "Password" });
+            }
+
+            // Password (string) minLength
+            if (this.Password != null && this.Password.Length < 10)
             {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for String, must match a pattern of " + regexString, new [] { "String" });
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Password, length must be greater than 10.", new [] { "Password" });
             }
 
             // PatternWithDigits (string) pattern
@@ -354,6 +347,13 @@ namespace Org.OpenAPITools.Model
                 yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PatternWithDigitsAndDelimiter, must match a pattern of " + regexPatternWithDigitsAndDelimiter, new [] { "PatternWithDigitsAndDelimiter" });
             }
 
+            // StringProperty (string) pattern
+            Regex regexStringProperty = new Regex(@"[a-z]", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+            if (false == regexStringProperty.Match(this.StringProperty).Success)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for StringProperty, must match a pattern of " + regexStringProperty, new [] { "StringProperty" });
+            }
+
             yield break;
         }
     }
@@ -380,22 +380,22 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            decimal number = default;
-            byte[] _byte = default;
+            System.IO.Stream binary = default;
+            byte[] byteProperty = default;
             DateTime date = default;
-            string password = default;
-            int integer = default;
+            DateTime dateTime = default;
+            decimal decimalProperty = default;
+            double doubleProperty = default;
+            float floatProperty = default;
             int int32 = default;
             long int64 = default;
-            float _float = default;
-            double _double = default;
-            decimal _decimal = default;
-            string _string = default;
-            System.IO.Stream binary = default;
-            DateTime dateTime = default;
-            Guid uuid = default;
+            int integer = default;
+            decimal number = default;
+            string password = default;
             string patternWithDigits = default;
             string patternWithDigitsAndDelimiter = default;
+            string stringProperty = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -412,20 +412,26 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "number":
-                            number = reader.GetInt32();
+                        case "binary":
+                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
                             break;
                         case "byte":
-                            _byte = JsonSerializer.Deserialize<byte[]>(ref reader, options);
+                            byteProperty = JsonSerializer.Deserialize<byte[]>(ref reader, options);
                             break;
                         case "date":
                             date = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "password":
-                            password = reader.GetString();
+                        case "dateTime":
+                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
-                        case "integer":
-                            integer = reader.GetInt32();
+                        case "decimal":
+                            decimalProperty = JsonSerializer.Deserialize<decimal>(ref reader, options);
+                            break;
+                        case "double":
+                            doubleProperty = reader.GetDouble();
+                            break;
+                        case "float":
+                            floatProperty = (float)reader.GetDouble();
                             break;
                         case "int32":
                             int32 = reader.GetInt32();
@@ -433,26 +439,14 @@ namespace Org.OpenAPITools.Model
                         case "int64":
                             int64 = reader.GetInt64();
                             break;
-                        case "float":
-                            _float = (float)reader.GetDouble();
-                            break;
-                        case "double":
-                            _double = reader.GetDouble();
-                            break;
-                        case "decimal":
-                            _decimal = JsonSerializer.Deserialize<decimal>(ref reader, options);
-                            break;
-                        case "string":
-                            _string = reader.GetString();
-                            break;
-                        case "binary":
-                            binary = JsonSerializer.Deserialize<System.IO.Stream>(ref reader, options);
+                        case "integer":
+                            integer = reader.GetInt32();
                             break;
-                        case "dateTime":
-                            dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
+                        case "number":
+                            number = reader.GetInt32();
                             break;
-                        case "uuid":
-                            uuid = reader.GetGuid();
+                        case "password":
+                            password = reader.GetString();
                             break;
                         case "pattern_with_digits":
                             patternWithDigits = reader.GetString();
@@ -460,13 +454,19 @@ namespace Org.OpenAPITools.Model
                         case "pattern_with_digits_and_delimiter":
                             patternWithDigitsAndDelimiter = reader.GetString();
                             break;
+                        case "string":
+                            stringProperty = reader.GetString();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new FormatTest(number, _byte, date, password, integer, int32, int64, _float, _double, _decimal, _string, binary, dateTime, uuid, patternWithDigits, patternWithDigitsAndDelimiter);
+            return new FormatTest(binary, byteProperty, date, dateTime, decimalProperty, doubleProperty, floatProperty, int32, int64, integer, number, password, patternWithDigits, patternWithDigitsAndDelimiter, stringProperty, uuid);
         }
 
         /// <summary>
@@ -480,27 +480,27 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("number", formatTest.Number);
+            writer.WritePropertyName("binary");
+            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("byte");
-            JsonSerializer.Serialize(writer, formatTest.Byte, options);
+            JsonSerializer.Serialize(writer, formatTest.ByteProperty, options);
             writer.WritePropertyName("date");
             JsonSerializer.Serialize(writer, formatTest.Date, options);
-            writer.WriteString("password", formatTest.Password);
-            writer.WriteNumber("integer", formatTest.Integer);
-            writer.WriteNumber("int32", formatTest.Int32);
-            writer.WriteNumber("int64", formatTest.Int64);
-            writer.WriteNumber("float", formatTest.Float);
-            writer.WriteNumber("double", formatTest.Double);
-            writer.WritePropertyName("decimal");
-            JsonSerializer.Serialize(writer, formatTest.Decimal, options);
-            writer.WriteString("string", formatTest.String);
-            writer.WritePropertyName("binary");
-            JsonSerializer.Serialize(writer, formatTest.Binary, options);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, formatTest.DateTime, options);
-            writer.WriteString("uuid", formatTest.Uuid);
+            writer.WritePropertyName("decimal");
+            JsonSerializer.Serialize(writer, formatTest.DecimalProperty, options);
+            writer.WriteNumber("double", formatTest.DoubleProperty);
+            writer.WriteNumber("float", formatTest.FloatProperty);
+            writer.WriteNumber("int32", formatTest.Int32);
+            writer.WriteNumber("int64", formatTest.Int64);
+            writer.WriteNumber("integer", formatTest.Integer);
+            writer.WriteNumber("number", formatTest.Number);
+            writer.WriteString("password", formatTest.Password);
             writer.WriteString("pattern_with_digits", formatTest.PatternWithDigits);
             writer.WriteString("pattern_with_digits_and_delimiter", formatTest.PatternWithDigitsAndDelimiter);
+            writer.WriteString("string", formatTest.StringProperty);
+            writer.WriteString("uuid", formatTest.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
index 413f56633ab..777120531d2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
-        /// <param name="mapMapOfString">mapMapOfString</param>
-        /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
+        /// <param name="mapMapOfString">mapMapOfString</param>
+        /// <param name="mapOfEnumString">mapOfEnumString</param>
         [JsonConstructor]
-        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString, Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap)
+        public MapTest(Dictionary<string, bool> directMap, Dictionary<string, bool> indirectMap, Dictionary<string, Dictionary<string, string>> mapMapOfString, Dictionary<string, MapTest.InnerEnum> mapOfEnumString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,10 +56,10 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            MapMapOfString = mapMapOfString;
-            MapOfEnumString = mapOfEnumString;
             DirectMap = directMap;
             IndirectMap = indirectMap;
+            MapMapOfString = mapMapOfString;
+            MapOfEnumString = mapOfEnumString;
         }
 
         /// <summary>
@@ -112,18 +112,6 @@ namespace Org.OpenAPITools.Model
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
 
-        /// <summary>
-        /// Gets or Sets MapMapOfString
-        /// </summary>
-        [JsonPropertyName("map_map_of_string")]
-        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -136,6 +124,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("indirect_map")]
         public Dictionary<string, bool> IndirectMap { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapMapOfString
+        /// </summary>
+        [JsonPropertyName("map_map_of_string")]
+        public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -150,10 +150,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MapTest {\n");
-            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
-            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  DirectMap: ").Append(DirectMap).Append("\n");
             sb.Append("  IndirectMap: ").Append(IndirectMap).Append("\n");
+            sb.Append("  MapMapOfString: ").Append(MapMapOfString).Append("\n");
+            sb.Append("  MapOfEnumString: ").Append(MapOfEnumString).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -191,10 +191,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
-            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
             Dictionary<string, bool> directMap = default;
             Dictionary<string, bool> indirectMap = default;
+            Dictionary<string, Dictionary<string, string>> mapMapOfString = default;
+            Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default;
 
             while (reader.Read())
             {
@@ -211,25 +211,25 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "map_map_of_string":
-                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
-                            break;
-                        case "map_of_enum_string":
-                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
-                            break;
                         case "direct_map":
                             directMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
                         case "indirect_map":
                             indirectMap = JsonSerializer.Deserialize<Dictionary<string, bool>>(ref reader, options);
                             break;
+                        case "map_map_of_string":
+                            mapMapOfString = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(ref reader, options);
+                            break;
+                        case "map_of_enum_string":
+                            mapOfEnumString = JsonSerializer.Deserialize<Dictionary<string, MapTest.InnerEnum>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MapTest(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+            return new MapTest(directMap, indirectMap, mapMapOfString, mapOfEnumString);
         }
 
         /// <summary>
@@ -243,14 +243,14 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WritePropertyName("map_map_of_string");
-            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
-            writer.WritePropertyName("map_of_enum_string");
-            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
             writer.WritePropertyName("direct_map");
             JsonSerializer.Serialize(writer, mapTest.DirectMap, options);
             writer.WritePropertyName("indirect_map");
             JsonSerializer.Serialize(writer, mapTest.IndirectMap, options);
+            writer.WritePropertyName("map_map_of_string");
+            JsonSerializer.Serialize(writer, mapTest.MapMapOfString, options);
+            writer.WritePropertyName("map_of_enum_string");
+            JsonSerializer.Serialize(writer, mapTest.MapOfEnumString, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index 520c4896c8b..4806980e331 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
         /// <param name="dateTime">dateTime</param>
         /// <param name="map">map</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public MixedPropertiesAndAdditionalPropertiesClass(Guid uuid, DateTime dateTime, Dictionary<string, Animal> map)
+        public MixedPropertiesAndAdditionalPropertiesClass(DateTime dateTime, Dictionary<string, Animal> map, Guid uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,17 +52,11 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
             DateTime = dateTime;
             Map = map;
+            Uuid = uuid;
         }
 
-        /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public Guid Uuid { get; set; }
-
         /// <summary>
         /// Gets or Sets DateTime
         /// </summary>
@@ -75,6 +69,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("map")]
         public Dictionary<string, Animal> Map { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public Guid Uuid { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
             sb.Append("  Map: ").Append(Map).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            Guid uuid = default;
             DateTime dateTime = default;
             Dictionary<string, Animal> map = default;
+            Guid uuid = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetGuid();
-                            break;
                         case "dateTime":
                             dateTime = JsonSerializer.Deserialize<DateTime>(ref reader, options);
                             break;
                         case "map":
                             map = JsonSerializer.Deserialize<Dictionary<string, Animal>>(ref reader, options);
                             break;
+                        case "uuid":
+                            uuid = reader.GetGuid();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new MixedPropertiesAndAdditionalPropertiesClass(uuid, dateTime, map);
+            return new MixedPropertiesAndAdditionalPropertiesClass(dateTime, map, uuid);
         }
 
         /// <summary>
@@ -177,11 +177,11 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
             writer.WritePropertyName("dateTime");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.DateTime, options);
             writer.WritePropertyName("map");
             JsonSerializer.Serialize(writer, mixedPropertiesAndAdditionalPropertiesClass.Map, options);
+            writer.WriteString("uuid", mixedPropertiesAndAdditionalPropertiesClass.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
index e805657a406..e4e9a8611ab 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Model200Response" /> class.
         /// </summary>
+        /// <param name="classProperty">classProperty</param>
         /// <param name="name">name</param>
-        /// <param name="_class">_class</param>
         [JsonConstructor]
-        public Model200Response(int name, string _class)
+        public Model200Response(string classProperty, int name)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,27 +42,27 @@ namespace Org.OpenAPITools.Model
             if (name == null)
                 throw new ArgumentNullException("name is a required property for Model200Response and cannot be null.");
 
-            if (_class == null)
-                throw new ArgumentNullException("_class is a required property for Model200Response and cannot be null.");
+            if (classProperty == null)
+                throw new ArgumentNullException("classProperty is a required property for Model200Response and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            ClassProperty = classProperty;
             Name = name;
-            Class = _class;
         }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Gets or Sets ClassProperty
         /// </summary>
-        [JsonPropertyName("name")]
-        public int Name { get; set; }
+        [JsonPropertyName("class")]
+        public string ClassProperty { get; set; }
 
         /// <summary>
-        /// Gets or Sets Class
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("class")]
-        public string Class { get; set; }
+        [JsonPropertyName("name")]
+        public int Name { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Model200Response {\n");
+            sb.Append("  ClassProperty: ").Append(ClassProperty).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Class: ").Append(Class).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            string classProperty = default;
             int name = default;
-            string _class = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "class":
+                            classProperty = reader.GetString();
+                            break;
                         case "name":
                             name = reader.GetInt32();
                             break;
-                        case "class":
-                            _class = reader.GetString();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Model200Response(name, _class);
+            return new Model200Response(classProperty, name);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteString("class", model200Response.ClassProperty);
             writer.WriteNumber("name", model200Response.Name);
-            writer.WriteString("class", model200Response.Class);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
index bb6857ac351..dc243ef72f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs
@@ -31,27 +31,27 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelClient" /> class.
         /// </summary>
-        /// <param name="_client">_client</param>
+        /// <param name="clientProperty">clientProperty</param>
         [JsonConstructor]
-        public ModelClient(string _client)
+        public ModelClient(string clientProperty)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_client == null)
-                throw new ArgumentNullException("_client is a required property for ModelClient and cannot be null.");
+            if (clientProperty == null)
+                throw new ArgumentNullException("clientProperty is a required property for ModelClient and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            _Client = _client;
+            _ClientProperty = clientProperty;
         }
 
         /// <summary>
-        /// Gets or Sets _Client
+        /// Gets or Sets _ClientProperty
         /// </summary>
         [JsonPropertyName("client")]
-        public string _Client { get; set; }
+        public string _ClientProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -67,7 +67,7 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ModelClient {\n");
-            sb.Append("  _Client: ").Append(_Client).Append("\n");
+            sb.Append("  _ClientProperty: ").Append(_ClientProperty).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,7 +105,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string _client = default;
+            string clientProperty = default;
 
             while (reader.Read())
             {
@@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
                     switch (propertyName)
                     {
                         case "client":
-                            _client = reader.GetString();
+                            clientProperty = reader.GetString();
                             break;
                         default:
                             break;
@@ -131,7 +131,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ModelClient(_client);
+            return new ModelClient(clientProperty);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("client", modelClient._Client);
+            writer.WriteString("client", modelClient._ClientProperty);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
index f22e38dfc5b..9b07795a3e5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs
@@ -32,17 +32,17 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// </summary>
         /// <param name="nameProperty">nameProperty</param>
-        /// <param name="snakeCase">snakeCase</param>
         /// <param name="property">property</param>
+        /// <param name="snakeCase">snakeCase</param>
         /// <param name="_123number">_123number</param>
         [JsonConstructor]
-        public Name(int nameProperty, int snakeCase, string property, int _123number)
+        public Name(int nameProperty, string property, int snakeCase, int _123number)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (name == null)
-                throw new ArgumentNullException("name is a required property for Name and cannot be null.");
+            if (nameProperty == null)
+                throw new ArgumentNullException("nameProperty is a required property for Name and cannot be null.");
 
             if (snakeCase == null)
                 throw new ArgumentNullException("snakeCase is a required property for Name and cannot be null.");
@@ -57,8 +57,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
             NameProperty = nameProperty;
-            SnakeCase = snakeCase;
             Property = property;
+            SnakeCase = snakeCase;
             _123Number = _123number;
         }
 
@@ -68,18 +68,18 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("name")]
         public int NameProperty { get; set; }
 
-        /// <summary>
-        /// Gets or Sets SnakeCase
-        /// </summary>
-        [JsonPropertyName("snake_case")]
-        public int SnakeCase { get; }
-
         /// <summary>
         /// Gets or Sets Property
         /// </summary>
         [JsonPropertyName("property")]
         public string Property { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SnakeCase
+        /// </summary>
+        [JsonPropertyName("snake_case")]
+        public int SnakeCase { get; }
+
         /// <summary>
         /// Gets or Sets _123Number
         /// </summary>
@@ -101,8 +101,8 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  NameProperty: ").Append(NameProperty).Append("\n");
-            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  Property: ").Append(Property).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("  _123Number: ").Append(_123Number).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
@@ -179,8 +179,8 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = reader.TokenType;
 
             int nameProperty = default;
-            int snakeCase = default;
             string property = default;
+            int snakeCase = default;
             int _123number = default;
 
             while (reader.Read())
@@ -201,12 +201,12 @@ namespace Org.OpenAPITools.Model
                         case "name":
                             nameProperty = reader.GetInt32();
                             break;
-                        case "snake_case":
-                            snakeCase = reader.GetInt32();
-                            break;
                         case "property":
                             property = reader.GetString();
                             break;
+                        case "snake_case":
+                            snakeCase = reader.GetInt32();
+                            break;
                         case "123Number":
                             _123number = reader.GetInt32();
                             break;
@@ -216,7 +216,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new Name(nameProperty, snakeCase, property, _123number);
+            return new Name(nameProperty, property, snakeCase, _123number);
         }
 
         /// <summary>
@@ -231,8 +231,8 @@ namespace Org.OpenAPITools.Model
             writer.WriteStartObject();
 
             writer.WriteNumber("name", name.NameProperty);
-            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteString("property", name.Property);
+            writer.WriteNumber("snake_case", name.SnakeCase);
             writer.WriteNumber("123Number", name._123Number);
 
             writer.WriteEndObject();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
index 2ad9b9f2522..5267e11d8b1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="NullableClass" /> class.
         /// </summary>
-        /// <param name="integerProp">integerProp</param>
-        /// <param name="numberProp">numberProp</param>
+        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
+        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
+        /// <param name="arrayNullableProp">arrayNullableProp</param>
         /// <param name="booleanProp">booleanProp</param>
-        /// <param name="stringProp">stringProp</param>
         /// <param name="dateProp">dateProp</param>
         /// <param name="datetimeProp">datetimeProp</param>
-        /// <param name="arrayNullableProp">arrayNullableProp</param>
-        /// <param name="arrayAndItemsNullableProp">arrayAndItemsNullableProp</param>
-        /// <param name="arrayItemsNullable">arrayItemsNullable</param>
-        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="integerProp">integerProp</param>
+        /// <param name="numberProp">numberProp</param>
         /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp</param>
-        /// <param name="objectItemsNullable">objectItemsNullable</param>
+        /// <param name="objectNullableProp">objectNullableProp</param>
+        /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(int? integerProp = default, decimal? numberProp = default, bool? booleanProp = default, string stringProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, List<Object> arrayNullableProp = default, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayItemsNullable, Dictionary<string, Object> objectNullableProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectItemsNullable) : base()
+        public NullableClass(List<Object> arrayItemsNullable, Dictionary<string, Object> objectItemsNullable, List<Object> arrayAndItemsNullableProp = default, List<Object> arrayNullableProp = default, bool? booleanProp = default, DateTime? dateProp = default, DateTime? datetimeProp = default, int? integerProp = default, decimal? numberProp = default, Dictionary<string, Object> objectAndItemsNullableProp = default, Dictionary<string, Object> objectNullableProp = default, string stringProp = default) : base()
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -58,43 +58,49 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            IntegerProp = integerProp;
-            NumberProp = numberProp;
+            ArrayItemsNullable = arrayItemsNullable;
+            ObjectItemsNullable = objectItemsNullable;
+            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
+            ArrayNullableProp = arrayNullableProp;
             BooleanProp = booleanProp;
-            StringProp = stringProp;
             DateProp = dateProp;
             DatetimeProp = datetimeProp;
-            ArrayNullableProp = arrayNullableProp;
-            ArrayAndItemsNullableProp = arrayAndItemsNullableProp;
-            ArrayItemsNullable = arrayItemsNullable;
-            ObjectNullableProp = objectNullableProp;
+            IntegerProp = integerProp;
+            NumberProp = numberProp;
             ObjectAndItemsNullableProp = objectAndItemsNullableProp;
-            ObjectItemsNullable = objectItemsNullable;
+            ObjectNullableProp = objectNullableProp;
+            StringProp = stringProp;
         }
 
         /// <summary>
-        /// Gets or Sets IntegerProp
+        /// Gets or Sets ArrayItemsNullable
         /// </summary>
-        [JsonPropertyName("integer_prop")]
-        public int? IntegerProp { get; set; }
+        [JsonPropertyName("array_items_nullable")]
+        public List<Object> ArrayItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets NumberProp
+        /// Gets or Sets ObjectItemsNullable
         /// </summary>
-        [JsonPropertyName("number_prop")]
-        public decimal? NumberProp { get; set; }
+        [JsonPropertyName("object_items_nullable")]
+        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
 
         /// <summary>
-        /// Gets or Sets BooleanProp
+        /// Gets or Sets ArrayAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("boolean_prop")]
-        public bool? BooleanProp { get; set; }
+        [JsonPropertyName("array_and_items_nullable_prop")]
+        public List<Object> ArrayAndItemsNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringProp
+        /// Gets or Sets ArrayNullableProp
         /// </summary>
-        [JsonPropertyName("string_prop")]
-        public string StringProp { get; set; }
+        [JsonPropertyName("array_nullable_prop")]
+        public List<Object> ArrayNullableProp { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BooleanProp
+        /// </summary>
+        [JsonPropertyName("boolean_prop")]
+        public bool? BooleanProp { get; set; }
 
         /// <summary>
         /// Gets or Sets DateProp
@@ -109,22 +115,22 @@ namespace Org.OpenAPITools.Model
         public DateTime? DatetimeProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayNullableProp
+        /// Gets or Sets IntegerProp
         /// </summary>
-        [JsonPropertyName("array_nullable_prop")]
-        public List<Object> ArrayNullableProp { get; set; }
+        [JsonPropertyName("integer_prop")]
+        public int? IntegerProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayAndItemsNullableProp
+        /// Gets or Sets NumberProp
         /// </summary>
-        [JsonPropertyName("array_and_items_nullable_prop")]
-        public List<Object> ArrayAndItemsNullableProp { get; set; }
+        [JsonPropertyName("number_prop")]
+        public decimal? NumberProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ArrayItemsNullable
+        /// Gets or Sets ObjectAndItemsNullableProp
         /// </summary>
-        [JsonPropertyName("array_items_nullable")]
-        public List<Object> ArrayItemsNullable { get; set; }
+        [JsonPropertyName("object_and_items_nullable_prop")]
+        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
 
         /// <summary>
         /// Gets or Sets ObjectNullableProp
@@ -133,16 +139,10 @@ namespace Org.OpenAPITools.Model
         public Dictionary<string, Object> ObjectNullableProp { get; set; }
 
         /// <summary>
-        /// Gets or Sets ObjectAndItemsNullableProp
-        /// </summary>
-        [JsonPropertyName("object_and_items_nullable_prop")]
-        public Dictionary<string, Object> ObjectAndItemsNullableProp { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ObjectItemsNullable
+        /// Gets or Sets StringProp
         /// </summary>
-        [JsonPropertyName("object_items_nullable")]
-        public Dictionary<string, Object> ObjectItemsNullable { get; set; }
+        [JsonPropertyName("string_prop")]
+        public string StringProp { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -153,18 +153,18 @@ namespace Org.OpenAPITools.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class NullableClass {\n");
             sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
-            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
+            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
+            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
+            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
             sb.Append("  BooleanProp: ").Append(BooleanProp).Append("\n");
-            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("  DateProp: ").Append(DateProp).Append("\n");
             sb.Append("  DatetimeProp: ").Append(DatetimeProp).Append("\n");
-            sb.Append("  ArrayNullableProp: ").Append(ArrayNullableProp).Append("\n");
-            sb.Append("  ArrayAndItemsNullableProp: ").Append(ArrayAndItemsNullableProp).Append("\n");
-            sb.Append("  ArrayItemsNullable: ").Append(ArrayItemsNullable).Append("\n");
-            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  IntegerProp: ").Append(IntegerProp).Append("\n");
+            sb.Append("  NumberProp: ").Append(NumberProp).Append("\n");
             sb.Append("  ObjectAndItemsNullableProp: ").Append(ObjectAndItemsNullableProp).Append("\n");
-            sb.Append("  ObjectItemsNullable: ").Append(ObjectItemsNullable).Append("\n");
+            sb.Append("  ObjectNullableProp: ").Append(ObjectNullableProp).Append("\n");
+            sb.Append("  StringProp: ").Append(StringProp).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -201,18 +201,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            int? integerProp = default;
-            decimal? numberProp = default;
+            List<Object> arrayItemsNullable = default;
+            Dictionary<string, Object> objectItemsNullable = default;
+            List<Object> arrayAndItemsNullableProp = default;
+            List<Object> arrayNullableProp = default;
             bool? booleanProp = default;
-            string stringProp = default;
             DateTime? dateProp = default;
             DateTime? datetimeProp = default;
-            List<Object> arrayNullableProp = default;
-            List<Object> arrayAndItemsNullableProp = default;
-            List<Object> arrayItemsNullable = default;
-            Dictionary<string, Object> objectNullableProp = default;
+            int? integerProp = default;
+            decimal? numberProp = default;
             Dictionary<string, Object> objectAndItemsNullableProp = default;
-            Dictionary<string, Object> objectItemsNullable = default;
+            Dictionary<string, Object> objectNullableProp = default;
+            string stringProp = default;
 
             while (reader.Read())
             {
@@ -229,43 +229,43 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "integer_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                integerProp = reader.GetInt32();
+                        case "array_items_nullable":
+                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
-                        case "number_prop":
-                            if (reader.TokenType != JsonTokenType.Null)
-                                numberProp = reader.GetInt32();
+                        case "object_items_nullable":
+                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                            break;
+                        case "array_and_items_nullable_prop":
+                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                            break;
+                        case "array_nullable_prop":
+                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
                             break;
                         case "boolean_prop":
                             booleanProp = reader.GetBoolean();
                             break;
-                        case "string_prop":
-                            stringProp = reader.GetString();
-                            break;
                         case "date_prop":
                             dateProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
                         case "datetime_prop":
                             datetimeProp = JsonSerializer.Deserialize<DateTime?>(ref reader, options);
                             break;
-                        case "array_nullable_prop":
-                            arrayNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "integer_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                integerProp = reader.GetInt32();
                             break;
-                        case "array_and_items_nullable_prop":
-                            arrayAndItemsNullableProp = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "number_prop":
+                            if (reader.TokenType != JsonTokenType.Null)
+                                numberProp = reader.GetInt32();
                             break;
-                        case "array_items_nullable":
-                            arrayItemsNullable = JsonSerializer.Deserialize<List<Object>>(ref reader, options);
+                        case "object_and_items_nullable_prop":
+                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
                         case "object_nullable_prop":
                             objectNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
                             break;
-                        case "object_and_items_nullable_prop":
-                            objectAndItemsNullableProp = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
-                            break;
-                        case "object_items_nullable":
-                            objectItemsNullable = JsonSerializer.Deserialize<Dictionary<string, Object>>(ref reader, options);
+                        case "string_prop":
+                            stringProp = reader.GetString();
                             break;
                         default:
                             break;
@@ -273,7 +273,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new NullableClass(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable);
+            return new NullableClass(arrayItemsNullable, objectItemsNullable, arrayAndItemsNullableProp, arrayNullableProp, booleanProp, dateProp, datetimeProp, integerProp, numberProp, objectAndItemsNullableProp, objectNullableProp, stringProp);
         }
 
         /// <summary>
@@ -287,35 +287,35 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            if (nullableClass.IntegerProp != null)
-                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
-            else
-                writer.WriteNull("integer_prop");
-            if (nullableClass.NumberProp != null)
-                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
-            else
-                writer.WriteNull("number_prop");
+            writer.WritePropertyName("array_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
+            writer.WritePropertyName("object_items_nullable");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("array_and_items_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
+            writer.WritePropertyName("array_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
             if (nullableClass.BooleanProp != null)
                 writer.WriteBoolean("boolean_prop", nullableClass.BooleanProp.Value);
             else
                 writer.WriteNull("boolean_prop");
-            writer.WriteString("string_prop", nullableClass.StringProp);
             writer.WritePropertyName("date_prop");
             JsonSerializer.Serialize(writer, nullableClass.DateProp, options);
             writer.WritePropertyName("datetime_prop");
             JsonSerializer.Serialize(writer, nullableClass.DatetimeProp, options);
-            writer.WritePropertyName("array_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayNullableProp, options);
-            writer.WritePropertyName("array_and_items_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayAndItemsNullableProp, options);
-            writer.WritePropertyName("array_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ArrayItemsNullable, options);
-            writer.WritePropertyName("object_nullable_prop");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            if (nullableClass.IntegerProp != null)
+                writer.WriteNumber("integer_prop", nullableClass.IntegerProp.Value);
+            else
+                writer.WriteNull("integer_prop");
+            if (nullableClass.NumberProp != null)
+                writer.WriteNumber("number_prop", nullableClass.NumberProp.Value);
+            else
+                writer.WriteNull("number_prop");
             writer.WritePropertyName("object_and_items_nullable_prop");
             JsonSerializer.Serialize(writer, nullableClass.ObjectAndItemsNullableProp, options);
-            writer.WritePropertyName("object_items_nullable");
-            JsonSerializer.Serialize(writer, nullableClass.ObjectItemsNullable, options);
+            writer.WritePropertyName("object_nullable_prop");
+            JsonSerializer.Serialize(writer, nullableClass.ObjectNullableProp, options);
+            writer.WriteString("string_prop", nullableClass.StringProp);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
index 5799fd94e53..225a89ebe9a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs
@@ -31,12 +31,12 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectWithDeprecatedFields" /> class.
         /// </summary>
-        /// <param name="uuid">uuid</param>
-        /// <param name="id">id</param>
-        /// <param name="deprecatedRef">deprecatedRef</param>
         /// <param name="bars">bars</param>
+        /// <param name="deprecatedRef">deprecatedRef</param>
+        /// <param name="id">id</param>
+        /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public ObjectWithDeprecatedFields(string uuid, decimal id, DeprecatedObject deprecatedRef, List<string> bars)
+        public ObjectWithDeprecatedFields(List<string> bars, DeprecatedObject deprecatedRef, decimal id, string uuid)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -56,24 +56,18 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Uuid = uuid;
-            Id = id;
-            DeprecatedRef = deprecatedRef;
             Bars = bars;
+            DeprecatedRef = deprecatedRef;
+            Id = id;
+            Uuid = uuid;
         }
 
         /// <summary>
-        /// Gets or Sets Uuid
-        /// </summary>
-        [JsonPropertyName("uuid")]
-        public string Uuid { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Id
+        /// Gets or Sets Bars
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonPropertyName("bars")]
         [Obsolete]
-        public decimal Id { get; set; }
+        public List<string> Bars { get; set; }
 
         /// <summary>
         /// Gets or Sets DeprecatedRef
@@ -83,11 +77,17 @@ namespace Org.OpenAPITools.Model
         public DeprecatedObject DeprecatedRef { get; set; }
 
         /// <summary>
-        /// Gets or Sets Bars
+        /// Gets or Sets Id
         /// </summary>
-        [JsonPropertyName("bars")]
+        [JsonPropertyName("id")]
         [Obsolete]
-        public List<string> Bars { get; set; }
+        public decimal Id { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Uuid
+        /// </summary>
+        [JsonPropertyName("uuid")]
+        public string Uuid { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -103,10 +103,10 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class ObjectWithDeprecatedFields {\n");
-            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
             sb.Append("  Bars: ").Append(Bars).Append("\n");
+            sb.Append("  DeprecatedRef: ").Append(DeprecatedRef).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -144,10 +144,10 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            string uuid = default;
-            decimal id = default;
-            DeprecatedObject deprecatedRef = default;
             List<string> bars = default;
+            DeprecatedObject deprecatedRef = default;
+            decimal id = default;
+            string uuid = default;
 
             while (reader.Read())
             {
@@ -164,17 +164,17 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "uuid":
-                            uuid = reader.GetString();
-                            break;
-                        case "id":
-                            id = reader.GetInt32();
+                        case "bars":
+                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "deprecatedRef":
                             deprecatedRef = JsonSerializer.Deserialize<DeprecatedObject>(ref reader, options);
                             break;
-                        case "bars":
-                            bars = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "id":
+                            id = reader.GetInt32();
+                            break;
+                        case "uuid":
+                            uuid = reader.GetString();
                             break;
                         default:
                             break;
@@ -182,7 +182,7 @@ namespace Org.OpenAPITools.Model
                 }
             }
 
-            return new ObjectWithDeprecatedFields(uuid, id, deprecatedRef, bars);
+            return new ObjectWithDeprecatedFields(bars, deprecatedRef, id, uuid);
         }
 
         /// <summary>
@@ -196,12 +196,12 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
-            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
-            writer.WritePropertyName("deprecatedRef");
-            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
             writer.WritePropertyName("bars");
             JsonSerializer.Serialize(writer, objectWithDeprecatedFields.Bars, options);
+            writer.WritePropertyName("deprecatedRef");
+            JsonSerializer.Serialize(writer, objectWithDeprecatedFields.DeprecatedRef, options);
+            writer.WriteNumber("id", objectWithDeprecatedFields.Id);
+            writer.WriteString("uuid", objectWithDeprecatedFields.Uuid);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
index bedf2f03a7f..67d1551e614 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs
@@ -31,11 +31,11 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="OuterComposite" /> class.
         /// </summary>
+        /// <param name="myBoolean">myBoolean</param>
         /// <param name="myNumber">myNumber</param>
         /// <param name="myString">myString</param>
-        /// <param name="myBoolean">myBoolean</param>
         [JsonConstructor]
-        public OuterComposite(decimal myNumber, string myString, bool myBoolean)
+        public OuterComposite(bool myBoolean, decimal myNumber, string myString)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -52,11 +52,17 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            MyBoolean = myBoolean;
             MyNumber = myNumber;
             MyString = myString;
-            MyBoolean = myBoolean;
         }
 
+        /// <summary>
+        /// Gets or Sets MyBoolean
+        /// </summary>
+        [JsonPropertyName("my_boolean")]
+        public bool MyBoolean { get; set; }
+
         /// <summary>
         /// Gets or Sets MyNumber
         /// </summary>
@@ -69,12 +75,6 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("my_string")]
         public string MyString { get; set; }
 
-        /// <summary>
-        /// Gets or Sets MyBoolean
-        /// </summary>
-        [JsonPropertyName("my_boolean")]
-        public bool MyBoolean { get; set; }
-
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -89,9 +89,9 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class OuterComposite {\n");
+            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  MyNumber: ").Append(MyNumber).Append("\n");
             sb.Append("  MyString: ").Append(MyString).Append("\n");
-            sb.Append("  MyBoolean: ").Append(MyBoolean).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -129,9 +129,9 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            bool myBoolean = default;
             decimal myNumber = default;
             string myString = default;
-            bool myBoolean = default;
 
             while (reader.Read())
             {
@@ -148,22 +148,22 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
+                        case "my_boolean":
+                            myBoolean = reader.GetBoolean();
+                            break;
                         case "my_number":
                             myNumber = reader.GetInt32();
                             break;
                         case "my_string":
                             myString = reader.GetString();
                             break;
-                        case "my_boolean":
-                            myBoolean = reader.GetBoolean();
-                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new OuterComposite(myNumber, myString, myBoolean);
+            return new OuterComposite(myBoolean, myNumber, myString);
         }
 
         /// <summary>
@@ -177,9 +177,9 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
             writer.WriteNumber("my_number", outerComposite.MyNumber);
             writer.WriteString("my_string", outerComposite.MyString);
-            writer.WriteBoolean("my_boolean", outerComposite.MyBoolean);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
index 0d090017be7..623ba045e38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs
@@ -31,14 +31,14 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="Pet" /> class.
         /// </summary>
+        /// <param name="category">category</param>
+        /// <param name="id">id</param>
         /// <param name="name">name</param>
         /// <param name="photoUrls">photoUrls</param>
-        /// <param name="id">id</param>
-        /// <param name="category">category</param>
-        /// <param name="tags">tags</param>
         /// <param name="status">pet status in the store</param>
+        /// <param name="tags">tags</param>
         [JsonConstructor]
-        public Pet(string name, List<string> photoUrls, long id, Category category, List<Tag> tags, StatusEnum status)
+        public Pet(Category category, long id, string name, List<string> photoUrls, StatusEnum status, List<Tag> tags)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -64,12 +64,12 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
+            Category = category;
+            Id = id;
             Name = name;
             PhotoUrls = photoUrls;
-            Id = id;
-            Category = category;
-            Tags = tags;
             Status = status;
+            Tags = tags;
         }
 
         /// <summary>
@@ -142,16 +142,10 @@ namespace Org.OpenAPITools.Model
         public StatusEnum Status { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
-        /// </summary>
-        [JsonPropertyName("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or Sets PhotoUrls
+        /// Gets or Sets Category
         /// </summary>
-        [JsonPropertyName("photoUrls")]
-        public List<string> PhotoUrls { get; set; }
+        [JsonPropertyName("category")]
+        public Category Category { get; set; }
 
         /// <summary>
         /// Gets or Sets Id
@@ -160,10 +154,16 @@ namespace Org.OpenAPITools.Model
         public long Id { get; set; }
 
         /// <summary>
-        /// Gets or Sets Category
+        /// Gets or Sets Name
         /// </summary>
-        [JsonPropertyName("category")]
-        public Category Category { get; set; }
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PhotoUrls
+        /// </summary>
+        [JsonPropertyName("photoUrls")]
+        public List<string> PhotoUrls { get; set; }
 
         /// <summary>
         /// Gets or Sets Tags
@@ -185,12 +185,12 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class Pet {\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Category: ").Append(Category).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Tags: ").Append(Tags).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -228,12 +228,12 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
+            Category category = default;
+            long id = default;
             string name = default;
             List<string> photoUrls = default;
-            long id = default;
-            Category category = default;
-            List<Tag> tags = default;
             Pet.StatusEnum status = default;
+            List<Tag> tags = default;
 
             while (reader.Read())
             {
@@ -250,32 +250,32 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "name":
-                            name = reader.GetString();
-                            break;
-                        case "photoUrls":
-                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
+                        case "category":
+                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
                             break;
                         case "id":
                             id = reader.GetInt64();
                             break;
-                        case "category":
-                            category = JsonSerializer.Deserialize<Category>(ref reader, options);
+                        case "name":
+                            name = reader.GetString();
                             break;
-                        case "tags":
-                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                        case "photoUrls":
+                            photoUrls = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                             break;
                         case "status":
                             string statusRawValue = reader.GetString();
                             status = Pet.StatusEnumFromString(statusRawValue);
                             break;
+                        case "tags":
+                            tags = JsonSerializer.Deserialize<List<Tag>>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new Pet(name, photoUrls, id, category, tags, status);
+            return new Pet(category, id, name, photoUrls, status, tags);
         }
 
         /// <summary>
@@ -289,19 +289,19 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
+            writer.WritePropertyName("category");
+            JsonSerializer.Serialize(writer, pet.Category, options);
+            writer.WriteNumber("id", pet.Id);
             writer.WriteString("name", pet.Name);
             writer.WritePropertyName("photoUrls");
             JsonSerializer.Serialize(writer, pet.PhotoUrls, options);
-            writer.WriteNumber("id", pet.Id);
-            writer.WritePropertyName("category");
-            JsonSerializer.Serialize(writer, pet.Category, options);
-            writer.WritePropertyName("tags");
-            JsonSerializer.Serialize(writer, pet.Tags, options);
             var statusRawValue = Pet.StatusEnumToJsonValue(pet.Status);
             if (statusRawValue != null)
                 writer.WriteString("status", statusRawValue);
             else
                 writer.WriteNull("status");
+            writer.WritePropertyName("tags");
+            JsonSerializer.Serialize(writer, pet.Tags, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
index fc6815b4f91..3ddbc0ada7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs
@@ -38,8 +38,8 @@ namespace Org.OpenAPITools.Model
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            if (_return == null)
-                throw new ArgumentNullException("_return is a required property for Return and cannot be null.");
+            if (returnProperty == null)
+                throw new ArgumentNullException("returnProperty is a required property for Return and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
index c9d60d18139..92b7dee149e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs
@@ -31,10 +31,10 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="SpecialModelName" /> class.
         /// </summary>
-        /// <param name="specialPropertyName">specialPropertyName</param>
         /// <param name="specialModelNameProperty">specialModelNameProperty</param>
+        /// <param name="specialPropertyName">specialPropertyName</param>
         [JsonConstructor]
-        public SpecialModelName(long specialPropertyName, string specialModelNameProperty)
+        public SpecialModelName(string specialModelNameProperty, long specialPropertyName)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -42,28 +42,28 @@ namespace Org.OpenAPITools.Model
             if (specialPropertyName == null)
                 throw new ArgumentNullException("specialPropertyName is a required property for SpecialModelName and cannot be null.");
 
-            if (specialModelName == null)
-                throw new ArgumentNullException("specialModelName is a required property for SpecialModelName and cannot be null.");
+            if (specialModelNameProperty == null)
+                throw new ArgumentNullException("specialModelNameProperty is a required property for SpecialModelName and cannot be null.");
 
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            SpecialPropertyName = specialPropertyName;
             SpecialModelNameProperty = specialModelNameProperty;
+            SpecialPropertyName = specialPropertyName;
         }
 
-        /// <summary>
-        /// Gets or Sets SpecialPropertyName
-        /// </summary>
-        [JsonPropertyName("$special[property.name]")]
-        public long SpecialPropertyName { get; set; }
-
         /// <summary>
         /// Gets or Sets SpecialModelNameProperty
         /// </summary>
         [JsonPropertyName("_special_model.name_")]
         public string SpecialModelNameProperty { get; set; }
 
+        /// <summary>
+        /// Gets or Sets SpecialPropertyName
+        /// </summary>
+        [JsonPropertyName("$special[property.name]")]
+        public long SpecialPropertyName { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -78,8 +78,8 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class SpecialModelName {\n");
-            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  SpecialModelNameProperty: ").Append(SpecialModelNameProperty).Append("\n");
+            sb.Append("  SpecialPropertyName: ").Append(SpecialPropertyName).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,8 +117,8 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long specialPropertyName = default;
             string specialModelNameProperty = default;
+            long specialPropertyName = default;
 
             while (reader.Read())
             {
@@ -135,19 +135,19 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "$special[property.name]":
-                            specialPropertyName = reader.GetInt64();
-                            break;
                         case "_special_model.name_":
                             specialModelNameProperty = reader.GetString();
                             break;
+                        case "$special[property.name]":
+                            specialPropertyName = reader.GetInt64();
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new SpecialModelName(specialPropertyName, specialModelNameProperty);
+            return new SpecialModelName(specialModelNameProperty, specialPropertyName);
         }
 
         /// <summary>
@@ -161,8 +161,8 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
             writer.WriteString("_special_model.name_", specialModelName.SpecialModelNameProperty);
+            writer.WriteNumber("$special[property.name]", specialModelName.SpecialPropertyName);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
index c59706d5d0c..c1b37bf1aa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs
@@ -31,20 +31,20 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.
         /// </summary>
-        /// <param name="id">id</param>
-        /// <param name="username">username</param>
+        /// <param name="email">email</param>
         /// <param name="firstName">firstName</param>
+        /// <param name="id">id</param>
         /// <param name="lastName">lastName</param>
-        /// <param name="email">email</param>
+        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
         /// <param name="password">password</param>
         /// <param name="phone">phone</param>
         /// <param name="userStatus">User Status</param>
-        /// <param name="objectWithNoDeclaredProps">test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</param>
-        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
+        /// <param name="username">username</param>
         /// <param name="anyTypeProp">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389</param>
         /// <param name="anyTypePropNullable">test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.</param>
+        /// <param name="objectWithNoDeclaredPropsNullable">test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</param>
         [JsonConstructor]
-        public User(long id, string username, string firstName, string lastName, string email, string password, string phone, int userStatus, Object objectWithNoDeclaredProps, Object objectWithNoDeclaredPropsNullable = default, Object anyTypeProp = default, Object anyTypePropNullable = default)
+        public User(string email, string firstName, long id, string lastName, Object objectWithNoDeclaredProps, string password, string phone, int userStatus, string username, Object anyTypeProp = default, Object anyTypePropNullable = default, Object objectWithNoDeclaredPropsNullable = default)
         {
 #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning disable CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
@@ -79,31 +79,25 @@ namespace Org.OpenAPITools.Model
 #pragma warning restore CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 #pragma warning restore CS8073 // The result of the expression is always the same since a value of this type is never equal to 'null'
 
-            Id = id;
-            Username = username;
+            Email = email;
             FirstName = firstName;
+            Id = id;
             LastName = lastName;
-            Email = email;
+            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
             Password = password;
             Phone = phone;
             UserStatus = userStatus;
-            ObjectWithNoDeclaredProps = objectWithNoDeclaredProps;
-            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
+            Username = username;
             AnyTypeProp = anyTypeProp;
             AnyTypePropNullable = anyTypePropNullable;
+            ObjectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
         }
 
         /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [JsonPropertyName("id")]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Username
+        /// Gets or Sets Email
         /// </summary>
-        [JsonPropertyName("username")]
-        public string Username { get; set; }
+        [JsonPropertyName("email")]
+        public string Email { get; set; }
 
         /// <summary>
         /// Gets or Sets FirstName
@@ -111,6 +105,12 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("firstName")]
         public string FirstName { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+        [JsonPropertyName("id")]
+        public long Id { get; set; }
+
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
@@ -118,10 +118,11 @@ namespace Org.OpenAPITools.Model
         public string LastName { get; set; }
 
         /// <summary>
-        /// Gets or Sets Email
+        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
         /// </summary>
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
+        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredProps")]
+        public Object ObjectWithNoDeclaredProps { get; set; }
 
         /// <summary>
         /// Gets or Sets Password
@@ -143,18 +144,10 @@ namespace Org.OpenAPITools.Model
         public int UserStatus { get; set; }
 
         /// <summary>
-        /// test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
-        /// </summary>
-        /// <value>test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredProps")]
-        public Object ObjectWithNoDeclaredProps { get; set; }
-
-        /// <summary>
-        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// Gets or Sets Username
         /// </summary>
-        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
-        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
-        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
+        [JsonPropertyName("username")]
+        public string Username { get; set; }
 
         /// <summary>
         /// test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
@@ -170,6 +163,13 @@ namespace Org.OpenAPITools.Model
         [JsonPropertyName("anyTypePropNullable")]
         public Object AnyTypePropNullable { get; set; }
 
+        /// <summary>
+        /// test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
+        /// </summary>
+        /// <value>test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.</value>
+        [JsonPropertyName("objectWithNoDeclaredPropsNullable")]
+        public Object ObjectWithNoDeclaredPropsNullable { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -184,18 +184,18 @@ namespace Org.OpenAPITools.Model
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("class User {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  Phone: ").Append(Phone).Append("\n");
             sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredProps: ").Append(ObjectWithNoDeclaredProps).Append("\n");
-            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
             sb.Append("  AnyTypeProp: ").Append(AnyTypeProp).Append("\n");
             sb.Append("  AnyTypePropNullable: ").Append(AnyTypePropNullable).Append("\n");
+            sb.Append("  ObjectWithNoDeclaredPropsNullable: ").Append(ObjectWithNoDeclaredPropsNullable).Append("\n");
             sb.Append("  AdditionalProperties: ").Append(AdditionalProperties).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -233,18 +233,18 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = reader.TokenType;
 
-            long id = default;
-            string username = default;
+            string email = default;
             string firstName = default;
+            long id = default;
             string lastName = default;
-            string email = default;
+            Object objectWithNoDeclaredProps = default;
             string password = default;
             string phone = default;
             int userStatus = default;
-            Object objectWithNoDeclaredProps = default;
-            Object objectWithNoDeclaredPropsNullable = default;
+            string username = default;
             Object anyTypeProp = default;
             Object anyTypePropNullable = default;
+            Object objectWithNoDeclaredPropsNullable = default;
 
             while (reader.Read())
             {
@@ -261,20 +261,20 @@ namespace Org.OpenAPITools.Model
 
                     switch (propertyName)
                     {
-                        case "id":
-                            id = reader.GetInt64();
-                            break;
-                        case "username":
-                            username = reader.GetString();
+                        case "email":
+                            email = reader.GetString();
                             break;
                         case "firstName":
                             firstName = reader.GetString();
                             break;
+                        case "id":
+                            id = reader.GetInt64();
+                            break;
                         case "lastName":
                             lastName = reader.GetString();
                             break;
-                        case "email":
-                            email = reader.GetString();
+                        case "objectWithNoDeclaredProps":
+                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
                         case "password":
                             password = reader.GetString();
@@ -285,11 +285,8 @@ namespace Org.OpenAPITools.Model
                         case "userStatus":
                             userStatus = reader.GetInt32();
                             break;
-                        case "objectWithNoDeclaredProps":
-                            objectWithNoDeclaredProps = JsonSerializer.Deserialize<Object>(ref reader, options);
-                            break;
-                        case "objectWithNoDeclaredPropsNullable":
-                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                        case "username":
+                            username = reader.GetString();
                             break;
                         case "anyTypeProp":
                             anyTypeProp = JsonSerializer.Deserialize<Object>(ref reader, options);
@@ -297,13 +294,16 @@ namespace Org.OpenAPITools.Model
                         case "anyTypePropNullable":
                             anyTypePropNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
                             break;
+                        case "objectWithNoDeclaredPropsNullable":
+                            objectWithNoDeclaredPropsNullable = JsonSerializer.Deserialize<Object>(ref reader, options);
+                            break;
                         default:
                             break;
                     }
                 }
             }
 
-            return new User(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
+            return new User(email, firstName, id, lastName, objectWithNoDeclaredProps, password, phone, userStatus, username, anyTypeProp, anyTypePropNullable, objectWithNoDeclaredPropsNullable);
         }
 
         /// <summary>
@@ -317,22 +317,22 @@ namespace Org.OpenAPITools.Model
         {
             writer.WriteStartObject();
 
-            writer.WriteNumber("id", user.Id);
-            writer.WriteString("username", user.Username);
+            writer.WriteString("email", user.Email);
             writer.WriteString("firstName", user.FirstName);
+            writer.WriteNumber("id", user.Id);
             writer.WriteString("lastName", user.LastName);
-            writer.WriteString("email", user.Email);
+            writer.WritePropertyName("objectWithNoDeclaredProps");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
             writer.WriteString("password", user.Password);
             writer.WriteString("phone", user.Phone);
             writer.WriteNumber("userStatus", user.UserStatus);
-            writer.WritePropertyName("objectWithNoDeclaredProps");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredProps, options);
-            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
-            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
+            writer.WriteString("username", user.Username);
             writer.WritePropertyName("anyTypeProp");
             JsonSerializer.Serialize(writer, user.AnyTypeProp, options);
             writer.WritePropertyName("anyTypePropNullable");
             JsonSerializer.Serialize(writer, user.AnyTypePropNullable, options);
+            writer.WritePropertyName("objectWithNoDeclaredPropsNullable");
+            JsonSerializer.Serialize(writer, user.ObjectWithNoDeclaredPropsNullable, options);
 
             writer.WriteEndObject();
         }
diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go
index 6981af581d9..d3bf38961f6 100644
--- a/samples/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_fake.go
@@ -1073,7 +1073,7 @@ type ApiTestEndpointParametersRequest struct {
 	int64_ *int64
 	float *float32
 	string_ *string
-	binary **os.File
+	binary *os.File
 	date *string
 	dateTime *time.Time
 	password *string
@@ -1135,7 +1135,7 @@ func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpoin
 }
 
 // None
-func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest {
+func (r ApiTestEndpointParametersRequest) Binary(binary os.File) ApiTestEndpointParametersRequest {
 	r.binary = &binary
 	return r
 }
@@ -1271,7 +1271,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 
 	binaryLocalVarFormFileName = "binary"
 
-	var binaryLocalVarFile **os.File
+	var binaryLocalVarFile *os.File
 	if r.binary != nil {
 		binaryLocalVarFile = r.binary
 	}
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index b3fed80ec4e..57f4495a1e4 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -895,7 +895,7 @@ type ApiUploadFileRequest struct {
 	ApiService PetApi
 	petId int64
 	additionalMetadata *string
-	file **os.File
+	file *os.File
 }
 
 // Additional data to pass to server
@@ -905,7 +905,7 @@ func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiU
 }
 
 // file to upload
-func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
+func (r ApiUploadFileRequest) File(file os.File) ApiUploadFileRequest {
 	r.file = &file
 	return r
 }
@@ -977,7 +977,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 
 	fileLocalVarFormFileName = "file"
 
-	var fileLocalVarFile **os.File
+	var fileLocalVarFile *os.File
 	if r.file != nil {
 		fileLocalVarFile = r.file
 	}
@@ -1029,12 +1029,12 @@ type ApiUploadFileWithRequiredFileRequest struct {
 	ctx context.Context
 	ApiService PetApi
 	petId int64
-	requiredFile **os.File
+	requiredFile *os.File
 	additionalMetadata *string
 }
 
 // file to upload
-func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest {
+func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile os.File) ApiUploadFileWithRequiredFileRequest {
 	r.requiredFile = &requiredFile
 	return r
 }
diff --git a/samples/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
index e51cddca5bd..8c4af68e455 100644
--- a/samples/client/petstore/go/go-petstore/docs/FakeApi.md
+++ b/samples/client/petstore/go/go-petstore/docs/FakeApi.md
@@ -574,7 +574,7 @@ func main() {
     int64_ := int64(789) // int64 | None (optional)
     float := float32(3.4) // float32 | None (optional)
     string_ := "string__example" // string | None (optional)
-    binary := os.NewFile(1234, "some_file") // *os.File | None (optional)
+    binary := os.NewFile(1234, "some_file") // os.File | None (optional)
     date := time.Now() // string | None (optional)
     dateTime := time.Now() // time.Time | None (optional)
     password := "password_example" // string | None (optional)
@@ -610,7 +610,7 @@ Name | Type | Description  | Notes
  **int64_** | **int64** | None | 
  **float** | **float32** | None | 
  **string_** | **string** | None | 
- **binary** | ***os.File** | None | 
+ **binary** | **os.File** | None | 
  **date** | **string** | None | 
  **dateTime** | **time.Time** | None | 
  **password** | **string** | None | 
diff --git a/samples/client/petstore/go/go-petstore/docs/FormatTest.md b/samples/client/petstore/go/go-petstore/docs/FormatTest.md
index e726c1ee939..2c486b4b6b0 100644
--- a/samples/client/petstore/go/go-petstore/docs/FormatTest.md
+++ b/samples/client/petstore/go/go-petstore/docs/FormatTest.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
 **Byte** | **string** |  | 
-**Binary** | Pointer to ***os.File** |  | [optional] 
+**Binary** | Pointer to **os.File** |  | [optional] 
 **Date** | **string** |  | 
 **DateTime** | Pointer to **time.Time** |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
@@ -230,20 +230,20 @@ SetByte sets Byte field to given value.
 
 ### GetBinary
 
-`func (o *FormatTest) GetBinary() *os.File`
+`func (o *FormatTest) GetBinary() os.File`
 
 GetBinary returns the Binary field if non-nil, zero value otherwise.
 
 ### GetBinaryOk
 
-`func (o *FormatTest) GetBinaryOk() (**os.File, bool)`
+`func (o *FormatTest) GetBinaryOk() (*os.File, bool)`
 
 GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetBinary
 
-`func (o *FormatTest) SetBinary(v *os.File)`
+`func (o *FormatTest) SetBinary(v os.File)`
 
 SetBinary sets Binary field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/PetApi.md b/samples/client/petstore/go/go-petstore/docs/PetApi.md
index 81c7e187ac7..519c51b2444 100644
--- a/samples/client/petstore/go/go-petstore/docs/PetApi.md
+++ b/samples/client/petstore/go/go-petstore/docs/PetApi.md
@@ -501,7 +501,7 @@ import (
 func main() {
     petId := int64(789) // int64 | ID of pet to update
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
-    file := os.NewFile(1234, "some_file") // *os.File | file to upload (optional)
+    file := os.NewFile(1234, "some_file") // os.File | file to upload (optional)
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -532,7 +532,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
  **additionalMetadata** | **string** | Additional data to pass to server | 
- **file** | ***os.File** | file to upload | 
+ **file** | **os.File** | file to upload | 
 
 ### Return type
 
@@ -572,7 +572,7 @@ import (
 
 func main() {
     petId := int64(789) // int64 | ID of pet to update
-    requiredFile := os.NewFile(1234, "some_file") // *os.File | file to upload
+    requiredFile := os.NewFile(1234, "some_file") // os.File | file to upload
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
 
     configuration := openapiclient.NewConfiguration()
@@ -603,7 +603,7 @@ Other parameters are passed through a pointer to a apiUploadFileWithRequiredFile
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **requiredFile** | ***os.File** | file to upload | 
+ **requiredFile** | **os.File** | file to upload | 
  **additionalMetadata** | **string** | Additional data to pass to server | 
 
 ### Return type
diff --git a/samples/client/petstore/go/go-petstore/model_format_test_.go b/samples/client/petstore/go/go-petstore/model_format_test_.go
index 0cfe962744c..48acbc14414 100644
--- a/samples/client/petstore/go/go-petstore/model_format_test_.go
+++ b/samples/client/petstore/go/go-petstore/model_format_test_.go
@@ -29,7 +29,7 @@ type FormatTest struct {
 	Double *float64 `json:"double,omitempty"`
 	String *string `json:"string,omitempty"`
 	Byte string `json:"byte"`
-	Binary **os.File `json:"binary,omitempty"`
+	Binary *os.File `json:"binary,omitempty"`
 	Date string `json:"date"`
 	DateTime *time.Time `json:"dateTime,omitempty"`
 	Uuid *string `json:"uuid,omitempty"`
@@ -299,9 +299,9 @@ func (o *FormatTest) SetByte(v string) {
 }
 
 // GetBinary returns the Binary field value if set, zero value otherwise.
-func (o *FormatTest) GetBinary() *os.File {
+func (o *FormatTest) GetBinary() os.File {
 	if o == nil || isNil(o.Binary) {
-		var ret *os.File
+		var ret os.File
 		return ret
 	}
 	return *o.Binary
@@ -309,7 +309,7 @@ func (o *FormatTest) GetBinary() *os.File {
 
 // GetBinaryOk returns a tuple with the Binary field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *FormatTest) GetBinaryOk() (**os.File, bool) {
+func (o *FormatTest) GetBinaryOk() (*os.File, bool) {
 	if o == nil || isNil(o.Binary) {
 		return nil, false
 	}
@@ -325,8 +325,8 @@ func (o *FormatTest) HasBinary() bool {
 	return false
 }
 
-// SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
-func (o *FormatTest) SetBinary(v *os.File) {
+// SetBinary gets a reference to the given os.File and assigns it to the Binary field.
+func (o *FormatTest) SetBinary(v os.File) {
 	o.Binary = &v
 }
 
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
index 7e5025e58ce..3b789c81367 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
@@ -4,14 +4,14 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_string** | **dict(str, str)** |  | [optional] 
-**map_number** | **dict(str, float)** |  | [optional] 
-**map_integer** | **dict(str, int)** |  | [optional] 
-**map_boolean** | **dict(str, bool)** |  | [optional] 
-**map_array_integer** | **dict(str, list[int])** |  | [optional] 
-**map_array_anytype** | **dict(str, list[object])** |  | [optional] 
-**map_map_string** | **dict(str, dict(str, str))** |  | [optional] 
-**map_map_anytype** | **dict(str, dict(str, object))** |  | [optional] 
+**map_string** | **dict[str, str]** |  | [optional] 
+**map_number** | **dict[str, float]** |  | [optional] 
+**map_integer** | **dict[str, int]** |  | [optional] 
+**map_boolean** | **dict[str, bool]** |  | [optional] 
+**map_array_integer** | **dict[str, list[int]]** |  | [optional] 
+**map_array_anytype** | **dict[str, list[object]]** |  | [optional] 
+**map_map_string** | **dict[str, dict[str, str]]** |  | [optional] 
+**map_map_anytype** | **dict[str, dict[str, object]]** |  | [optional] 
 **anytype_1** | **object** |  | [optional] 
 **anytype_2** | **object** |  | [optional] 
 **anytype_3** | **object** |  | [optional] 
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
index 52c475c4460..b561f467d21 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
@@ -36,14 +36,14 @@ class AdditionalPropertiesClass(object):
                             and the value is json key in definition.
     """
     openapi_types = {
-        'map_string': 'dict(str, str)',
-        'map_number': 'dict(str, float)',
-        'map_integer': 'dict(str, int)',
-        'map_boolean': 'dict(str, bool)',
-        'map_array_integer': 'dict(str, list[int])',
-        'map_array_anytype': 'dict(str, list[object])',
-        'map_map_string': 'dict(str, dict(str, str))',
-        'map_map_anytype': 'dict(str, dict(str, object))',
+        'map_string': 'dict[str, str]',
+        'map_number': 'dict[str, float]',
+        'map_integer': 'dict[str, int]',
+        'map_boolean': 'dict[str, bool]',
+        'map_array_integer': 'dict[str, list[int]]',
+        'map_array_anytype': 'dict[str, list[object]]',
+        'map_map_string': 'dict[str, dict[str, str]]',
+        'map_map_anytype': 'dict[str, dict[str, object]]',
         'anytype_1': 'object',
         'anytype_2': 'object',
         'anytype_3': 'object'
@@ -111,7 +111,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, str)
+        :rtype: dict[str, str]
         """
         return self._map_string
 
@@ -121,7 +121,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_string: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_string: dict(str, str)
+        :type map_string: dict[str, str]
         """
 
         self._map_string = map_string
@@ -132,7 +132,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, float)
+        :rtype: dict[str, float]
         """
         return self._map_number
 
@@ -142,7 +142,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_number: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_number: dict(str, float)
+        :type map_number: dict[str, float]
         """
 
         self._map_number = map_number
@@ -153,7 +153,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, int)
+        :rtype: dict[str, int]
         """
         return self._map_integer
 
@@ -163,7 +163,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_integer: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_integer: dict(str, int)
+        :type map_integer: dict[str, int]
         """
 
         self._map_integer = map_integer
@@ -174,7 +174,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, bool)
+        :rtype: dict[str, bool]
         """
         return self._map_boolean
 
@@ -184,7 +184,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_boolean: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_boolean: dict(str, bool)
+        :type map_boolean: dict[str, bool]
         """
 
         self._map_boolean = map_boolean
@@ -195,7 +195,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, list[int])
+        :rtype: dict[str, list[int]]
         """
         return self._map_array_integer
 
@@ -205,7 +205,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_integer: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_array_integer: dict(str, list[int])
+        :type map_array_integer: dict[str, list[int]]
         """
 
         self._map_array_integer = map_array_integer
@@ -216,7 +216,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, list[object])
+        :rtype: dict[str, list[object]]
         """
         return self._map_array_anytype
 
@@ -226,7 +226,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_anytype: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_array_anytype: dict(str, list[object])
+        :type map_array_anytype: dict[str, list[object]]
         """
 
         self._map_array_anytype = map_array_anytype
@@ -237,7 +237,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, dict(str, str))
+        :rtype: dict[str, dict[str, str]]
         """
         return self._map_map_string
 
@@ -247,7 +247,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_string: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_map_string: dict(str, dict(str, str))
+        :type map_map_string: dict[str, dict[str, str]]
         """
 
         self._map_map_string = map_map_string
@@ -258,7 +258,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, dict(str, object))
+        :rtype: dict[str, dict[str, object]]
         """
         return self._map_map_anytype
 
@@ -268,7 +268,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_anytype: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_map_anytype: dict(str, dict(str, object))
+        :type map_map_anytype: dict[str, dict[str, object]]
         """
 
         self._map_map_anytype = map_map_anytype
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
index 50e790d06d1..7237aeb0956 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1965,7 +1965,9 @@ components:
     NullableAllOf:
       properties:
         child:
-          $ref: '#/components/schemas/NullableAllOf_child'
+          allOf:
+          - $ref: '#/components/schemas/NullableAllOfChild'
+          nullable: true
       type: object
     OneOfPrimitiveType:
       oneOf:
@@ -2184,10 +2186,6 @@ components:
           type: boolean
       type: object
       example: null
-    NullableAllOf_child:
-      allOf:
-      - $ref: '#/components/schemas/NullableAllOfChild'
-      nullable: true
     DuplicatedPropChild_allOf:
       properties:
         dup-prop:
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
index 0994d7aaef5..5a183d84881 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
@@ -1099,7 +1099,7 @@ type ApiTestEndpointParametersRequest struct {
 	int64_ *int64
 	float *float32
 	string_ *string
-	binary **os.File
+	binary *os.File
 	date *string
 	dateTime *time.Time
 	password *string
@@ -1161,7 +1161,7 @@ func (r ApiTestEndpointParametersRequest) String_(string_ string) ApiTestEndpoin
 }
 
 // None
-func (r ApiTestEndpointParametersRequest) Binary(binary *os.File) ApiTestEndpointParametersRequest {
+func (r ApiTestEndpointParametersRequest) Binary(binary os.File) ApiTestEndpointParametersRequest {
 	r.binary = &binary
 	return r
 }
@@ -1298,7 +1298,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 
 	binaryLocalVarFormFileName = "binary"
 
-	var binaryLocalVarFile **os.File
+	var binaryLocalVarFile *os.File
 	if r.binary != nil {
 		binaryLocalVarFile = r.binary
 	}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
index 052f7b9a45a..34f0b0be002 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
@@ -916,7 +916,7 @@ type ApiUploadFileRequest struct {
 	ApiService PetApi
 	petId int64
 	additionalMetadata *string
-	file **os.File
+	file *os.File
 }
 
 // Additional data to pass to server
@@ -926,7 +926,7 @@ func (r ApiUploadFileRequest) AdditionalMetadata(additionalMetadata string) ApiU
 }
 
 // file to upload
-func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
+func (r ApiUploadFileRequest) File(file os.File) ApiUploadFileRequest {
 	r.file = &file
 	return r
 }
@@ -1000,7 +1000,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 
 	fileLocalVarFormFileName = "file"
 
-	var fileLocalVarFile **os.File
+	var fileLocalVarFile *os.File
 	if r.file != nil {
 		fileLocalVarFile = r.file
 	}
@@ -1052,12 +1052,12 @@ type ApiUploadFileWithRequiredFileRequest struct {
 	ctx context.Context
 	ApiService PetApi
 	petId int64
-	requiredFile **os.File
+	requiredFile *os.File
 	additionalMetadata *string
 }
 
 // file to upload
-func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile *os.File) ApiUploadFileWithRequiredFileRequest {
+func (r ApiUploadFileWithRequiredFileRequest) RequiredFile(requiredFile os.File) ApiUploadFileWithRequiredFileRequest {
 	r.requiredFile = &requiredFile
 	return r
 }
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
index 7f9d080e73e..050416eabd8 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md
@@ -571,7 +571,7 @@ func main() {
     int64_ := int64(789) // int64 | None (optional)
     float := float32(3.4) // float32 | None (optional)
     string_ := "string__example" // string | None (optional)
-    binary := os.NewFile(1234, "some_file") // *os.File | None (optional)
+    binary := os.NewFile(1234, "some_file") // os.File | None (optional)
     date := time.Now() // string | None (optional)
     dateTime := time.Now() // time.Time | None (optional)
     password := "password_example" // string | None (optional)
@@ -607,7 +607,7 @@ Name | Type | Description  | Notes
  **int64_** | **int64** | None | 
  **float** | **float32** | None | 
  **string_** | **string** | None | 
- **binary** | ***os.File** | None | 
+ **binary** | **os.File** | None | 
  **date** | **string** | None | 
  **dateTime** | **time.Time** | None | 
  **password** | **string** | None | 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
index 2e2ed889929..392cf79236a 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FormatTest.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **Double** | Pointer to **float64** |  | [optional] 
 **String** | Pointer to **string** |  | [optional] 
 **Byte** | **string** |  | 
-**Binary** | Pointer to ***os.File** |  | [optional] 
+**Binary** | Pointer to **os.File** |  | [optional] 
 **Date** | **string** |  | 
 **DateTime** | Pointer to **time.Time** |  | [optional] 
 **Uuid** | Pointer to **string** |  | [optional] 
@@ -231,20 +231,20 @@ SetByte sets Byte field to given value.
 
 ### GetBinary
 
-`func (o *FormatTest) GetBinary() *os.File`
+`func (o *FormatTest) GetBinary() os.File`
 
 GetBinary returns the Binary field if non-nil, zero value otherwise.
 
 ### GetBinaryOk
 
-`func (o *FormatTest) GetBinaryOk() (**os.File, bool)`
+`func (o *FormatTest) GetBinaryOk() (*os.File, bool)`
 
 GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetBinary
 
-`func (o *FormatTest) SetBinary(v *os.File)`
+`func (o *FormatTest) SetBinary(v os.File)`
 
 SetBinary sets Binary field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
index 245df44f8db..6514a699f0f 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/MapOfFileTest.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**PropTest** | Pointer to **map[string]*os.File** | a property to test map of file | [optional] 
+**PropTest** | Pointer to **map[string]os.File** | a property to test map of file | [optional] 
 
 ## Methods
 
@@ -27,20 +27,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetPropTest
 
-`func (o *MapOfFileTest) GetPropTest() map[string]*os.File`
+`func (o *MapOfFileTest) GetPropTest() map[string]os.File`
 
 GetPropTest returns the PropTest field if non-nil, zero value otherwise.
 
 ### GetPropTestOk
 
-`func (o *MapOfFileTest) GetPropTestOk() (*map[string]*os.File, bool)`
+`func (o *MapOfFileTest) GetPropTestOk() (*map[string]os.File, bool)`
 
 GetPropTestOk returns a tuple with the PropTest field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetPropTest
 
-`func (o *MapOfFileTest) SetPropTest(v map[string]*os.File)`
+`func (o *MapOfFileTest) SetPropTest(v map[string]os.File)`
 
 SetPropTest sets PropTest field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
index 24b558097a7..7bf269f8930 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md
@@ -511,7 +511,7 @@ import (
 func main() {
     petId := int64(789) // int64 | ID of pet to update
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
-    file := os.NewFile(1234, "some_file") // *os.File | file to upload (optional)
+    file := os.NewFile(1234, "some_file") // os.File | file to upload (optional)
 
     configuration := openapiclient.NewConfiguration()
     apiClient := openapiclient.NewAPIClient(configuration)
@@ -542,7 +542,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
  **additionalMetadata** | **string** | Additional data to pass to server | 
- **file** | ***os.File** | file to upload | 
+ **file** | **os.File** | file to upload | 
 
 ### Return type
 
@@ -584,7 +584,7 @@ import (
 
 func main() {
     petId := int64(789) // int64 | ID of pet to update
-    requiredFile := os.NewFile(1234, "some_file") // *os.File | file to upload
+    requiredFile := os.NewFile(1234, "some_file") // os.File | file to upload
     additionalMetadata := "additionalMetadata_example" // string | Additional data to pass to server (optional)
 
     configuration := openapiclient.NewConfiguration()
@@ -615,7 +615,7 @@ Other parameters are passed through a pointer to a apiUploadFileWithRequiredFile
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **requiredFile** | ***os.File** | file to upload | 
+ **requiredFile** | **os.File** | file to upload | 
  **additionalMetadata** | **string** | Additional data to pass to server | 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
index fe95d07ffaf..0086958677d 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_format_test_.go
@@ -29,7 +29,7 @@ type FormatTest struct {
 	Double *float64 `json:"double,omitempty"`
 	String *string `json:"string,omitempty"`
 	Byte string `json:"byte"`
-	Binary **os.File `json:"binary,omitempty"`
+	Binary *os.File `json:"binary,omitempty"`
 	Date string `json:"date"`
 	DateTime *time.Time `json:"dateTime,omitempty"`
 	Uuid *string `json:"uuid,omitempty"`
@@ -305,9 +305,9 @@ func (o *FormatTest) SetByte(v string) {
 }
 
 // GetBinary returns the Binary field value if set, zero value otherwise.
-func (o *FormatTest) GetBinary() *os.File {
+func (o *FormatTest) GetBinary() os.File {
 	if o == nil || isNil(o.Binary) {
-		var ret *os.File
+		var ret os.File
 		return ret
 	}
 	return *o.Binary
@@ -315,7 +315,7 @@ func (o *FormatTest) GetBinary() *os.File {
 
 // GetBinaryOk returns a tuple with the Binary field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *FormatTest) GetBinaryOk() (**os.File, bool) {
+func (o *FormatTest) GetBinaryOk() (*os.File, bool) {
 	if o == nil || isNil(o.Binary) {
 		return nil, false
 	}
@@ -331,8 +331,8 @@ func (o *FormatTest) HasBinary() bool {
 	return false
 }
 
-// SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
-func (o *FormatTest) SetBinary(v *os.File) {
+// SetBinary gets a reference to the given os.File and assigns it to the Binary field.
+func (o *FormatTest) SetBinary(v os.File) {
 	o.Binary = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
index a96502e0847..f696a624be3 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_map_of_file_test_.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &MapOfFileTest{}
 // MapOfFileTest test map of file in a property
 type MapOfFileTest struct {
 	// a property to test map of file
-	PropTest *map[string]*os.File `json:"prop_test,omitempty"`
+	PropTest *map[string]os.File `json:"prop_test,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
 
@@ -45,9 +45,9 @@ func NewMapOfFileTestWithDefaults() *MapOfFileTest {
 }
 
 // GetPropTest returns the PropTest field value if set, zero value otherwise.
-func (o *MapOfFileTest) GetPropTest() map[string]*os.File {
+func (o *MapOfFileTest) GetPropTest() map[string]os.File {
 	if o == nil || isNil(o.PropTest) {
-		var ret map[string]*os.File
+		var ret map[string]os.File
 		return ret
 	}
 	return *o.PropTest
@@ -55,7 +55,7 @@ func (o *MapOfFileTest) GetPropTest() map[string]*os.File {
 
 // GetPropTestOk returns a tuple with the PropTest field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MapOfFileTest) GetPropTestOk() (*map[string]*os.File, bool) {
+func (o *MapOfFileTest) GetPropTestOk() (*map[string]os.File, bool) {
 	if o == nil || isNil(o.PropTest) {
 		return nil, false
 	}
@@ -71,8 +71,8 @@ func (o *MapOfFileTest) HasPropTest() bool {
 	return false
 }
 
-// SetPropTest gets a reference to the given map[string]*os.File and assigns it to the PropTest field.
-func (o *MapOfFileTest) SetPropTest(v map[string]*os.File) {
+// SetPropTest gets a reference to the given map[string]os.File and assigns it to the PropTest field.
+func (o *MapOfFileTest) SetPropTest(v map[string]os.File) {
 	o.PropTest = &v
 }
 
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
index 44eba731566..d08ea901b62 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
@@ -4,8 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_property** | **dict(str, str)** |  | [optional] 
-**map_of_map_property** | **dict(str, dict(str, str))** |  | [optional] 
+**map_property** | **dict[str, str]** |  | [optional] 
+**map_of_map_property** | **dict[str, dict[str, str]]** |  | [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/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
index f8303e680b2..710807587e2 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/additional_properties_class.py
@@ -36,8 +36,8 @@ class AdditionalPropertiesClass(object):
                             and the value is json key in definition.
     """
     openapi_types = {
-        'map_property': 'dict(str, str)',
-        'map_of_map_property': 'dict(str, dict(str, str))'
+        'map_property': 'dict[str, str]',
+        'map_of_map_property': 'dict[str, dict[str, str]]'
     }
 
     attribute_map = {
@@ -66,7 +66,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, str)
+        :rtype: dict[str, str]
         """
         return self._map_property
 
@@ -76,7 +76,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_property: The map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_property: dict(str, str)
+        :type map_property: dict[str, str]
         """
 
         self._map_property = map_property
@@ -87,7 +87,7 @@ class AdditionalPropertiesClass(object):
 
 
         :return: The map_of_map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :rtype: dict(str, dict(str, str))
+        :rtype: dict[str, dict[str, str]]
         """
         return self._map_of_map_property
 
@@ -97,7 +97,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_of_map_property: The map_of_map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type map_of_map_property: dict(str, dict(str, str))
+        :type map_of_map_property: dict[str, dict[str, str]]
         """
 
         self._map_of_map_property = map_of_map_property
diff --git a/samples/server/petstore/go-api-server/go/api.go b/samples/server/petstore/go-api-server/go/api.go
index bedb0f7985e..cac28b4f04a 100644
--- a/samples/server/petstore/go-api-server/go/api.go
+++ b/samples/server/petstore/go-api-server/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-api-server/go/api_pet_service.go b/samples/server/petstore/go-api-server/go/api_pet_service.go
index 9a390ecef3d..7a77914cafd 100644
--- a/samples/server/petstore/go-api-server/go/api_pet_service.go
+++ b/samples/server/petstore/go-api-server/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
diff --git a/samples/server/petstore/go-chi-server/go/api.go b/samples/server/petstore/go-chi-server/go/api.go
index bedb0f7985e..cac28b4f04a 100644
--- a/samples/server/petstore/go-chi-server/go/api.go
+++ b/samples/server/petstore/go-chi-server/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-chi-server/go/api_pet_service.go b/samples/server/petstore/go-chi-server/go/api_pet_service.go
index 9a390ecef3d..7a77914cafd 100644
--- a/samples/server/petstore/go-chi-server/go/api_pet_service.go
+++ b/samples/server/petstore/go-chi-server/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
diff --git a/samples/server/petstore/go-server-required/go/api.go b/samples/server/petstore/go-server-required/go/api.go
index bedb0f7985e..cac28b4f04a 100644
--- a/samples/server/petstore/go-server-required/go/api.go
+++ b/samples/server/petstore/go-server-required/go/api.go
@@ -68,7 +68,7 @@ type PetApiServicer interface {
 	GetPetById(context.Context, int64) (ImplResponse, error)
 	UpdatePet(context.Context, Pet) (ImplResponse, error)
 	UpdatePetWithForm(context.Context, int64, string, string) (ImplResponse, error)
-	UploadFile(context.Context, int64, string, *os.File) (ImplResponse, error)
+	UploadFile(context.Context, int64, string, os.File) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/petstore/go-server-required/go/api_pet_service.go b/samples/server/petstore/go-server-required/go/api_pet_service.go
index 9a390ecef3d..7a77914cafd 100644
--- a/samples/server/petstore/go-server-required/go/api_pet_service.go
+++ b/samples/server/petstore/go-server-required/go/api_pet_service.go
@@ -130,7 +130,7 @@ func (s *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, name
 }
 
 // UploadFile - uploads an image
-func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file *os.File) (ImplResponse, error) {
+func (s *PetApiService) UploadFile(ctx context.Context, petId int64, additionalMetadata string, file os.File) (ImplResponse, error) {
 	// TODO - update UploadFile with the required logic for this service method.
 	// Add api_pet_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
-- 
GitLab


From f24e0e6b1a28a61e8ded16aec01eb86d5e41ded0 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Fri, 30 Dec 2022 10:12:36 -0700
Subject: [PATCH 8/9] Update docs

---
 docs/generators/java.md               | 2 +-
 docs/generators/python-legacy.md      | 2 ++
 docs/generators/python-prior.md       | 2 ++
 docs/generators/python.md             | 2 ++
 docs/generators/swift5.md             | 1 +
 docs/generators/typescript-angular.md | 4 ++--
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/generators/java.md b/docs/generators/java.md
index 43a723d2ed5..89cc2f2c33e 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -56,7 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 4.x</dd></dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**jersey3**</dt><dd>HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x. or Gson 2.x</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: JSON-B</dd><dt>**apache-httpclient**</dt><dd>HTTP client: Apache httpclient 4.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |microprofileFramework|Framework for microprofile. Possible values &quot;kumuluzee&quot;| |null|
diff --git a/docs/generators/python-legacy.md b/docs/generators/python-legacy.md
index 0af42bd30b9..3d0b1165a61 100644
--- a/docs/generators/python-legacy.md
+++ b/docs/generators/python-legacy.md
@@ -45,6 +45,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
+<li>Dict</li>
+<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/python-prior.md b/docs/generators/python-prior.md
index 00a89120d77..82e50b4f4a2 100644
--- a/docs/generators/python-prior.md
+++ b/docs/generators/python-prior.md
@@ -47,6 +47,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
+<li>Dict</li>
+<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/python.md b/docs/generators/python.md
index 4cbf616d091..b62d4af85bc 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -47,6 +47,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
+<li>Dict</li>
+<li>List</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index 2fc6ba96fbc..72887e3b55f 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false|
 |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true|
 |useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null|
+|validatable|Make validation rules and validator for model properies (default: true)| |true|
 
 ## IMPORT MAPPING
 
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index 7fde34c39a3..be23681e750 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -11,7 +11,7 @@ title: Documentation for the typescript-angular Generator
 | generator type | CLIENT | |
 | generator language | Typescript | |
 | generator default templating engine | mustache | |
-| helpTxt | Generates a TypeScript Angular (9.x - 14.x) client library. | |
+| helpTxt | Generates a TypeScript Angular (9.x - 15.x) client library. | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
@@ -31,7 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |modelFileSuffix|The suffix of the file of the generated model (model&lt;suffix&gt;.ts).| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |modelSuffix|The suffix of the generated model.| |null|
-|ngVersion|The version of Angular. (At least 9.0.0)| |14.0.5|
+|ngVersion|The version of Angular. (At least 9.0.0)| |15.0.3|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
 |npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
-- 
GitLab


From e84a31e43e5370ab79ddde2fcfd759dfa4576e43 Mon Sep 17 00:00:00 2001
From: Ian Cubbon <ianc@spectralogic.com>
Date: Fri, 30 Dec 2022 10:28:48 -0700
Subject: [PATCH 9/9] Revert some weird git stuff that happened with the
 Readme.md

---
 README.md | 658 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 397 insertions(+), 261 deletions(-)

diff --git a/README.md b/README.md
index 1cff54906bf..2138bae23d8 100644
--- a/README.md
+++ b/README.md
@@ -67,326 +67,462 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRAhEYadUyZYzGUotZiSdXkVMqqLGuohyixLl4eUpUV6pAbUULL" width="150">](https://checklyhq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
+OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
+
+|                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
+| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                                                           |
+| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+
+## Table of contents
+
+  - [OpenAPI Generator](#openapi-generator)
+  - [Overview](#overview)
+  - [Table of Contents](#table-of-contents)
+  - [1 - Installation](#1---installation)
+    - [1.1 - Compatibility](#11---compatibility)
+    - [1.2 - Artifacts on Maven Central](#12---artifacts-on-maven-central)
+    - [1.3 - Download JAR](#13---download-jar)
+    - [1.4 - Build Projects](#14---build-projects)
+    - [1.5 - Homebrew](#15---homebrew)
+    - [1.6 - Docker](#16---docker)
+    - [1.7 - NPM](#17---npm)
+  - [2 - Getting Started](#2---getting-started)
+  - [3 - Usage](#3---usage)
+    - [3.1 - Customization](#31---customization)
+    - [3.2 - Workflow Integration](#32---workflow-integration-maven-gradle-github-cicd)
+    - [3.3 - Online Generators](#33---online-openapi-generator)
+    - [3.4 - License Information on Generated Code](#34---license-information-on-generated-code)
+    - [3.5 - IDE Integration](#35---ide-integration)
+  - [4 - Companies/Projects using OpenAPI Generator](#4---companiesprojects-using-openapi-generator)
+  - [5 - Presentations/Videos/Tutorials/Books](#5---presentationsvideostutorialsbooks)
+  - [6 - About Us](#6---about-us)
+    - [6.1 - OpenAPI Generator Core Team](#61---openapi-generator-core-team)
+    - [6.2 - OpenAPI Generator Technical Committee](#62---openapi-generator-technical-committee)
+    - [6.3 - History of OpenAPI Generator](#63---history-of-openapi-generator)
+  - [7 - License](#7---license)
+
+## [1 - Installation](#table-of-contents)
+
+### [1.1 - Compatibility](#table-of-contents)
+
+The OpenAPI Specification has undergone 3 revisions since initial creation in 2010.  The openapi-generator project has the following compatibilities with the OpenAPI Specification:
+
+| OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
+| 7.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.0.0-SNAPSHOT/) | Feb/Mar 2023   | Major release with breaking changes (no fallback) |
+| 6.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.3.0-SNAPSHOT/) | 05.12.2022   | Minor release with breaking changes (with fallback) |
+| [6.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.2.1) (latest stable release)                                                    | 01.11.2022   | Patch release (enhancements, bug fixes, etc) |
+| [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
+| [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
+
+OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
+
+For old releases, please refer to the [**Release**](https://github.com/OpenAPITools/openapi-generator/releases) page.
+
+## [1.2 - Artifacts on Maven Central](#table-of-contents)
+
+You can find our released artifacts on maven central:
+
+**Core:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+See the different versions of the [openapi-generator](https://search.maven.org/artifact/org.openapitools/openapi-generator) artifact available on maven central.
+
+**Cli:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-cli</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+See the different versions of the [openapi-generator-cli](https://search.maven.org/artifact/org.openapitools/openapi-generator-cli) artifact available on maven central.
+
+**Maven plugin:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-maven-plugin</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* See the different versions of the [openapi-generator-maven-plugin](https://search.maven.org/artifact/org.openapitools/openapi-generator-maven-plugin) artifact available on maven central.
+* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md)
+
+**Gradle plugin:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-gradle-plugin</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* See the different versions of the [openapi-generator-gradle-plugin](https://search.maven.org/artifact/org.openapitools/openapi-generator-gradle-plugin) artifact available on maven central.
+* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc)
 
-- API version: 1.0.0
-- Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.GoClientCodegen
+### [1.3 - Download JAR](#table-of-contents)
+<!-- RELEASE_VERSION -->
+If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-## Installation
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar`
 
-Install the following dependencies:
+For **Mac/Linux** users:
+```sh
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar -O openapi-generator-cli.jar
+```
 
-```shell
-go get github.com/stretchr/testify/assert
-go get golang.org/x/oauth2
-go get golang.org/x/net/context
+For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
+```
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar
 ```
 
-Put the package under your project folder and add the following in import:
+After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
 
-```golang
-import openapi "github.com/GIT_USER_ID/GIT_REPO_ID"
+For Mac users, please make sure Java 8 is installed (Tips: run `java -version` to check the version), and export `JAVA_HOME` in order to use the supported Java version:
+```sh
+export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+export PATH=${JAVA_HOME}/bin:$PATH
 ```
+<!-- /RELEASE_VERSION -->
+### Launcher Script
+
+One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
 
-To use a proxy, set the environment variable `HTTP_PROXY`:
+To install the launcher script, copy the contents of the script to a location on your path and make the script executable.
 
-```golang
-os.Setenv("HTTP_PROXY", "http://proxy_name:proxy_port")
+An example of setting this up (NOTE: Always evaluate scripts curled from external systems before executing them).
+
+```
+mkdir -p ~/bin/openapitools
+curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli
+chmod u+x ~/bin/openapitools/openapi-generator-cli
+export PATH=$PATH:~/bin/openapitools/
 ```
 
-## Configuration of Server URL
+Now, `openapi-generator-cli` is "installed". On invocation, it will query the GitHub repository for the most recently released version. If this matches the last downloaded jar,
+it will execute as normal. If a newer version is found, the script will download the latest release and execute it.
 
-Default configuration comes with `Servers` field that contains server objects as defined in the OpenAPI specification.
+If you need to invoke an older version of the generator, you can define the variable `OPENAPI_GENERATOR_VERSION` either ad hoc or globally. You can export this variable if you'd like to persist a specific release version.
+
+Examples:
+
+```
+# Execute latest released openapi-generator-cli
+openapi-generator-cli version
+
+# Execute version 4.1.0 for the current invocation, regardless of the latest released version
+OPENAPI_GENERATOR_VERSION=4.1.0 openapi-generator-cli version
+
+# Execute version 4.1.0-SNAPSHOT for the current invocation
+OPENAPI_GENERATOR_VERSION=4.1.0-SNAPSHOT openapi-generator-cli version
+
+# Execute version 4.0.2 for every invocation in the current shell session
+export OPENAPI_GENERATOR_VERSION=4.0.2
+openapi-generator-cli version # is 4.0.2
+openapi-generator-cli version # is also 4.0.2
+
+# To "install" a specific version, set the variable in .bashrc/.bash_profile
+echo "export OPENAPI_GENERATOR_VERSION=4.0.2" >> ~/.bashrc
+source ~/.bashrc
+openapi-generator-cli version # is always 4.0.2, unless any of the above overrides are done ad hoc
+```
 
-### Select Server Configuration
+### [1.4 - Build Projects](#table-of-contents)
 
-For using other server than the one defined on index 0 set context value `sw.ContextServerIndex` of type `int`.
+To build from source, you need the following installed and available in your `$PATH:`
+
+* [Java 8](https://www.oracle.com/technetwork/java/index.html)
+
+* [Apache Maven 3.3.4 or greater](https://maven.apache.org/)
+
+After cloning the project, you can build it from source with this command:
+```sh
+mvn clean install
+```
+
+If you don't have maven installed, you may directly use the included [maven wrapper](https://github.com/takari/maven-wrapper), and build with the command:
+```sh
+./mvnw clean install
+```
+
+The default build contains minimal static analysis (via CheckStyle). To run your build with PMD and Spotbugs, use the `static-analysis` profile:
+
+```sh
+mvn -Pstatic-analysis clean install
+```
+
+### [1.5 - Homebrew](#table-of-contents)
+
+To install, run `brew install openapi-generator`
+
+Here is an example usage to generate a Ruby client:
+```sh
+openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g ruby -o /tmp/test/
+```
+
+To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
+
+To install OpenJDK (pre-requisites), please run
+```sh
+brew tap AdoptOpenJDK/openjdk
+brew install --cask adoptopenjdk12
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
+```
 
-```golang
-ctx := context.WithValue(context.Background(), openapi.ContextServerIndex, 1)
+To install Maven, please run
+```sh
+brew install maven
 ```
 
-### Templated Server URL
+### [1.6 - Docker](#table-of-contents)
 
-Templated server URL is formatted using default variables from configuration or from context value `sw.ContextServerVariables` of type `map[string]string`.
+#### Public Pre-built Docker images
 
-```golang
-ctx := context.WithValue(context.Background(), openapi.ContextServerVariables, map[string]string{
-	"basePath": "v2",
-})
+ - [https://hub.docker.com/r/openapitools/openapi-generator-cli/](https://hub.docker.com/r/openapitools/openapi-generator-cli/) (official CLI)
+ - [https://hub.docker.com/r/openapitools/openapi-generator-online/](https://hub.docker.com/r/openapitools/openapi-generator-online/) (official web service)
+
+
+#### OpenAPI Generator CLI Docker Image
+
+The OpenAPI Generator image acts as a standalone executable. It can be used as an alternative to installing via homebrew, or for developers who are unable to install Java or upgrade the installed version.
+
+To generate code with this image, you'll need to mount a local location as a volume.
+
+Example:
+
+```sh
+docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
+    -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+    -g go \
+    -o /local/out/go
 ```
 
-Note, enum values are always validated and all unused variables are silently ignored.
+The generated code will be located under `./out/go` in the current directory.
+
+#### OpenAPI Generator Online Docker Image
+
+The openapi-generator-online image can act as a self-hosted web application and API for generating code. This container can be incorporated into a CI pipeline, and requires at least two HTTP requests and some docker orchestration to access generated code.
+
+Example usage:
 
-### URLs Configuration per Operation
+```sh
+# Start container at port 8888 and save the container id
+> CID=$(docker run -d -p 8888:8080 openapitools/openapi-generator-online)
 
-Each operation can use different server URL defined using `OperationServers` map in the `Configuration`.
-An operation is uniquely identified by `"{classname}Service.{nickname}"` string.
-Similar rules for overriding default operation server index and variables applies by using `sw.ContextOperationServerIndices` and `sw.ContextOperationServerVariables` context maps.
+# allow for startup
+> sleep 10
 
-```golang
-ctx := context.WithValue(context.Background(), openapi.ContextOperationServerIndices, map[string]int{
-	"{classname}Service.{nickname}": 2,
-})
-ctx = context.WithValue(context.Background(), openapi.ContextOperationServerVariables, map[string]map[string]string{
-	"{classname}Service.{nickname}": {
-		"port": "8443",
-	},
-})
+# Get the IP of the running container (optional)
+GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}'  $CID)
+
+# Execute an HTTP request to generate a Ruby client
+> curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' \
+-d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
+'http://localhost:8888/api/gen/clients/ruby'
+
+{"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}
+
+# Download the generated zip file
+> wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8
+
+# Unzip the file
+> unzip c2d483.3.4672-40e9-91df-b9ffd18d22b8
+
+# Shutdown the openapi generator image
+> docker stop $CID && docker rm $CID
 ```
 
-## Documentation for API Endpoints
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **Patch** /another-fake/dummy | To test special tags
-*DefaultApi* | [**FooGet**](docs/DefaultApi.md#fooget) | **Get** /foo | 
-*FakeApi* | [**FakeHealthGet**](docs/FakeApi.md#fakehealthget) | **Get** /fake/health | Health check endpoint
-*FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **Post** /fake/outer/boolean | 
-*FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **Post** /fake/outer/composite | 
-*FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **Post** /fake/outer/number | 
-*FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **Post** /fake/outer/string | 
-*FakeApi* | [**TestBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **Put** /fake/body-with-file-schema | 
-*FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **Put** /fake/body-with-query-params | 
-*FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **Patch** /fake | To test \&quot;client\&quot; model
-*FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **Post** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-*FakeApi* | [**TestEnumParameters**](docs/FakeApi.md#testenumparameters) | **Get** /fake | To test enum parameters
-*FakeApi* | [**TestGroupParameters**](docs/FakeApi.md#testgroupparameters) | **Delete** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**TestInlineAdditionalProperties**](docs/FakeApi.md#testinlineadditionalproperties) | **Post** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**TestJsonFormData**](docs/FakeApi.md#testjsonformdata) | **Get** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**TestQueryParameterCollectionFormat**](docs/FakeApi.md#testqueryparametercollectionformat) | **Put** /fake/test-query-parameters | 
-*FakeApi* | [**TestUniqueItemsHeaderAndQueryParameterCollectionFormat**](docs/FakeApi.md#testuniqueitemsheaderandqueryparametercollectionformat) | **Put** /fake/test-unique-parameters | 
-*FakeClassnameTags123Api* | [**TestClassname**](docs/FakeClassnameTags123Api.md#testclassname) | **Patch** /fake_classname_test | To test class name in snake case
-*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **Post** /pet | Add a new pet to the store
-*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **Delete** /pet/{petId} | Deletes a pet
-*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **Get** /pet/findByStatus | Finds Pets by status
-*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **Get** /pet/findByTags | Finds Pets by tags
-*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **Get** /pet/{petId} | Find pet by ID
-*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **Put** /pet | Update an existing pet
-*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **Post** /pet/{petId} | Updates a pet in the store with form data
-*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **Post** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**UploadFileWithRequiredFile**](docs/PetApi.md#uploadfilewithrequiredfile) | **Post** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **Delete** /store/order/{order_id} | Delete purchase order by ID
-*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **Get** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **Get** /store/order/{order_id} | Find purchase order by ID
-*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **Post** /store/order | Place an order for a pet
-*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **Post** /user | Create user
-*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **Post** /user/createWithArray | Creates list of users with given input array
-*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **Post** /user/createWithList | Creates list of users with given input array
-*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **Delete** /user/{username} | Delete user
-*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **Get** /user/{username} | Get user by user name
-*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **Get** /user/login | Logs user into the system
-*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **Get** /user/logout | Logs out current logged in user session
-*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **Put** /user/{username} | Updated user
-
-
-## Documentation For Models
-
- - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- - [Animal](docs/Animal.md)
- - [ApiResponse](docs/ApiResponse.md)
- - [Apple](docs/Apple.md)
- - [AppleReq](docs/AppleReq.md)
- - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
- - [ArrayTest](docs/ArrayTest.md)
- - [Banana](docs/Banana.md)
- - [BananaReq](docs/BananaReq.md)
- - [Capitalization](docs/Capitalization.md)
- - [Cat](docs/Cat.md)
- - [CatAllOf](docs/CatAllOf.md)
- - [Category](docs/Category.md)
- - [ClassModel](docs/ClassModel.md)
- - [Client](docs/Client.md)
- - [Dog](docs/Dog.md)
- - [DogAllOf](docs/DogAllOf.md)
- - [DuplicatedPropChild](docs/DuplicatedPropChild.md)
- - [DuplicatedPropChildAllOf](docs/DuplicatedPropChildAllOf.md)
- - [DuplicatedPropParent](docs/DuplicatedPropParent.md)
- - [EnumArrays](docs/EnumArrays.md)
- - [EnumClass](docs/EnumClass.md)
- - [EnumTest](docs/EnumTest.md)
- - [File](docs/File.md)
- - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
- - [Foo](docs/Foo.md)
- - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md)
- - [FormatTest](docs/FormatTest.md)
- - [Fruit](docs/Fruit.md)
- - [FruitReq](docs/FruitReq.md)
- - [GmFruit](docs/GmFruit.md)
- - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
- - [HealthCheckResult](docs/HealthCheckResult.md)
- - [List](docs/List.md)
- - [Mammal](docs/Mammal.md)
- - [MapOfFileTest](docs/MapOfFileTest.md)
- - [MapTest](docs/MapTest.md)
- - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model200Response](docs/Model200Response.md)
- - [Name](docs/Name.md)
- - [NullableAllOf](docs/NullableAllOf.md)
- - [NullableAllOfChild](docs/NullableAllOfChild.md)
- - [NullableClass](docs/NullableClass.md)
- - [NumberOnly](docs/NumberOnly.md)
- - [OneOfPrimitiveType](docs/OneOfPrimitiveType.md)
- - [OneOfPrimitiveTypeChild](docs/OneOfPrimitiveTypeChild.md)
- - [OneOfPrimitiveTypes](docs/OneOfPrimitiveTypes.md)
- - [OneOfWithNestedPrimitiveTime](docs/OneOfWithNestedPrimitiveTime.md)
- - [OneOfWithNestedPrimitiveTimeAvatar](docs/OneOfWithNestedPrimitiveTimeAvatar.md)
- - [Order](docs/Order.md)
- - [OuterComposite](docs/OuterComposite.md)
- - [OuterEnum](docs/OuterEnum.md)
- - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
- - [OuterEnumInteger](docs/OuterEnumInteger.md)
- - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
- - [Pet](docs/Pet.md)
- - [PrimitiveAndPrimitiveTime](docs/PrimitiveAndPrimitiveTime.md)
- - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
- - [ReadOnlyWithDefault](docs/ReadOnlyWithDefault.md)
- - [Return](docs/Return.md)
- - [SpecialModelName](docs/SpecialModelName.md)
- - [Tag](docs/Tag.md)
- - [User](docs/User.md)
- - [Whale](docs/Whale.md)
- - [Zebra](docs/Zebra.md)
-
-
-## Documentation For Authorization
-
-
-
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-Note, each API key must be added to a map of `map[string]APIKey` where the key is: api_key and passed in as the auth context for each request.
-
-
-### api_key_query
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-Note, each API key must be added to a map of `map[string]APIKey` where the key is: api_key_query and passed in as the auth context for each request.
-
-
-### bearer_test
-
-- **Type**: HTTP Bearer token authentication
-
-Example
-
-```golang
-auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARER_TOKEN_STRING")
-r, err := client.Service.Operation(auth, args)
+#### Development in docker
+
+You can use `run-in-docker.sh` to do all development. This script maps your local repository to `/gen`
+in the docker container. It also maps `~/.m2/repository` to the appropriate container location.
+
+To execute `mvn package`:
+
+```sh
+git clone https://github.com/openapitools/openapi-generator
+cd openapi-generator
+./run-in-docker.sh mvn package
 ```
 
+Build artifacts are now accessible in your working directory.
 
-### http_basic_test
+Once built, `run-in-docker.sh` will act as an executable for openapi-generator-cli. To generate code, you'll need to output to a directory under `/gen` (e.g. `/gen/out`). For example:
 
-- **Type**: HTTP basic authentication
+```sh
+./run-in-docker.sh help # Executes 'help' command for openapi-generator-cli
+./run-in-docker.sh list # Executes 'list' command for openapi-generator-cli
+./run-in-docker.sh /gen/bin/go-petstore.sh  # Builds the Go client
+./run-in-docker.sh generate -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+    -g go -o /gen/out/go-petstore -p packageName=petstore # generates go client, outputs locally to ./out/go-petstore
+```
+
+##### Troubleshooting
 
-Example
+If an error like this occurs, just execute the **mvn clean install -U** command:
 
-```golang
-auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-    UserName: "username",
-    Password: "password",
-})
-r, err := client.Service.Operation(auth, args)
+> org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project openapi-generator: A type incompatibility occurred while executing org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test: java.lang.ExceptionInInitializerError cannot be cast to java.io.IOException
+
+```sh
+./run-in-docker.sh mvn clean install -U
 ```
 
+> Failed to execute goal org.fortasoft:gradle-maven-plugin:1.0.8:invoke (default) on project openapi-generator-gradle-plugin-mvn-wrapper: org.gradle.tooling.BuildException: Could not execute build using Gradle distribution 'https://services.gradle.org/distributions/gradle-4.7-bin.zip'
 
-### http_signature_test
-
-- **Type**: HTTP signature authentication
-
-Example
-
-```golang
-	authConfig := client.HttpSignatureAuth{
-		KeyId:                "my-key-id",
-		PrivateKeyPath:       "rsa.pem",
-		Passphrase:           "my-passphrase",
-		SigningScheme:        sw.HttpSigningSchemeHs2019,
-		SignedHeaders:        []string{
-			sw.HttpSignatureParameterRequestTarget, // The special (request-target) parameter expresses the HTTP request target.
-			sw.HttpSignatureParameterCreated,       // Time when request was signed, formatted as a Unix timestamp integer value.
-			"Host",                                 // The Host request header specifies the domain name of the server, and optionally the TCP port number.
-			"Date",                                 // The date and time at which the message was originated.
-			"Content-Type",                         // The Media type of the body of the request.
-			"Digest",                               // A cryptographic digest of the request body.
-		},
-		SigningAlgorithm:     sw.HttpSigningAlgorithmRsaPSS,
-		SignatureMaxValidity: 5 * time.Minute,
-	}
-	var authCtx context.Context
-	var err error
-	if authCtx, err = authConfig.ContextWithValue(context.Background()); err != nil {
-		// Process error
-	}
-	r, err = client.Service.Operation(auth, args)
+Right now: no solution for this one :|
 
+#### Run Docker in Vagrant
+Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
+ ```sh
+git clone https://github.com/openapitools/openapi-generator.git
+cd openapi-generator
+vagrant up
+vagrant ssh
+cd /vagrant
+./run-in-docker.sh mvn package
 ```
 
-### petstore_auth
+### [1.7 - NPM](#table-of-contents)
+
+There is also an [NPM package wrapper](https://www.npmjs.com/package/@openapitools/openapi-generator-cli) available for different platforms (e.g. Linux, Mac, Windows). (JVM is still required)
+Please see the [project's README](https://github.com/openapitools/openapi-generator-cli) there for more information.
 
+Install it globally to get the CLI available on the command line:
 
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
- - **write:pets**: modify pets in your account
- - **read:pets**: read your pets
+```sh
+npm install @openapitools/openapi-generator-cli -g
+openapi-generator-cli version
+```
+
+<!-- RELEASE_VERSION -->
+To use a specific version of "openapi-generator-cli"
+
+```sh
+openapi-generator-cli version-manager set 6.2.1
+```
 
-Example
+Or install it as dev-dependency:
 
-```golang
-auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
-r, err := client.Service.Operation(auth, args)
+```sh
+npm install @openapitools/openapi-generator-cli -D
 ```
+<!-- /RELEASE_VERSION -->
+## [2 - Getting Started](#table-of-contents)
+
+To generate a PHP client for [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml), please run the following
+```sh
+git clone https://github.com/openapitools/openapi-generator
+cd openapi-generator
+mvn clean package
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
+   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+   -g php \
+   -o /var/tmp/php_api_client
+```
+(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
+
+<!-- RELEASE_VERSION -->
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.2.1/openapi-generator-cli-6.2.1.jar)
+<!-- /RELEASE_VERSION -->
 
-Or via OAuth2 module to automatically refresh tokens and perform user authentication.
+To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
 
-```golang
-import "golang.org/x/oauth2"
+To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar config-help -g php`
 
-/* Perform OAuth2 round trip request and obtain a token */
+## [3 - Usage](#table-of-contents)
 
-tokenSource := oauth2cfg.TokenSource(createContext(httpClient), &token)
-auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
-r, err := client.Service.Operation(auth, args)
+### To generate a sample client library
+You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) as follows:
+
+```sh
+./bin/generate-samples.sh ./bin/configs/java-okhttp-gson.yaml
 ```
 
+(On Windows, please install [GIT Bash for Windows](https://gitforwindows.org/) to run the command above)
+
+This script uses the default library, which is `okhttp-gson`. It will run the generator with this command:
 
-## Documentation for Utility Methods
+```sh
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
+  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+  -g java \
+  -t modules/openapi-generator/src/main/resources/Java \
+  --additional-properties artifactId=petstore-okhttp-gson,hideGenerationTimestamp:true \
+  -o samples/client/petstore/java/okhttp-gson
+```
 
-Due to the fact that model structure members are all pointers, this package contains
-a number of utility functions to easily obtain pointers to values of basic types.
-Each of these functions takes a value of the given basic type and returns a pointer to it:
+with a number of options. [The java options are documented here.](docs/generators/java.md)
 
-* `PtrBool`
-* `PtrInt`
-* `PtrInt32`
-* `PtrInt64`
-* `PtrFloat`
-* `PtrFloat32`
-* `PtrFloat64`
-* `PtrString`
-* `PtrTime`
+You can also get the options with the `help generate` command (below only shows partial results):
 
-## Author
+```
+NAME
+        openapi-generator-cli generate - Generate code with the specified
+        generator.
+
+SYNOPSIS
+        openapi-generator-cli generate
+                [(-a <authorization> | --auth <authorization>)]
+                [--api-name-suffix <api name suffix>] [--api-package <api package>]
+                [--artifact-id <artifact id>] [--artifact-version <artifact version>]
+                [(-c <configuration file> | --config <configuration file>)] [--dry-run]
+                [(-e <templating engine> | --engine <templating engine>)]
+                [--enable-post-process-file]
+                [(-g <generator name> | --generator-name <generator name>)]
+                [--generate-alias-as-model] [--git-host <git host>]
+                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
+                [--global-property <global properties>...] [--group-id <group id>]
+                [--http-user-agent <http user agent>]
+                [(-i <spec file> | --input-spec <spec file>)]
+                [--ignore-file-override <ignore file override location>]
+                [--import-mappings <import mappings>...]
+                [--instantiation-types <instantiation types>...]
+                [--invoker-package <invoker package>]
+                [--language-specific-primitives <language specific primitives>...]
+                [--legacy-discriminator-behavior] [--library <library>]
+                [--log-to-stderr] [--minimal-update]
+                [--model-name-prefix <model name prefix>]
+                [--model-name-suffix <model name suffix>]
+                [--model-package <model package>]
+                [(-o <output directory> | --output <output directory>)] [(-p <additional properties> | --additional-properties <additional properties>)...]
+                [--package-name <package name>] [--release-note <release note>]
+                [--remove-operation-id-prefix]
+                [--reserved-words-mappings <reserved word mappings>...]
+                [(-s | --skip-overwrite)] [--server-variables <server variables>...]
+                [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
+                [(-t <template directory> | --template-dir <template directory>)]
+                [--type-mappings <type mappings>...] [(-v | --verbose)]
+
+OPTIONS
+        -a <authorization>, --auth <authorization>
+            adds authorization headers when fetching the OpenAPI definitions
+            remotely. Pass in a URL-encoded string of name:header with a comma
+            separating multiple values
+
+...... (results omitted)
+
+        -v, --verbose
+            verbose mode
 
+```
 
+You can then compile and run the client, as well as unit tests against it:
 
+```sh
+cd samples/client/petstore/java/okhttp-gson
+mvn package
+```
 
 Other generators have [samples](https://github.com/OpenAPITools/openapi-generator/tree/master/samples) too.
 
-- 
GitLab