From 2e2ca2549861b613042b7281c25b69c0802d09a0 Mon Sep 17 00:00:00 2001
From: Roemer Vlasveld <roemer.vlasveld@gmail.com>
Date: Tue, 9 Jun 2026 07:26:07 +0200
Subject: [PATCH 1/2] fix(core): stop reusing anonymous inline schemas across
 different parents (#18963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Anonymous (untitled) inline schemas have context-derived names (e.g.
`Item_user`). When two parent schemas define structurally identical inline
objects without a `title`, the resolver was reusing the first-seen model
for all subsequent matches, forcing a misleading name onto unrelated
contexts.

The fix adds a title guard in `matchGenerated`: only titled schemas are
eligible for structural reuse, consistent with the two other dedup paths
in the same file that already gate on `title`:
- the `flatten()` pre-populate step (lines 198-202)
- the `deduplicateComponents()` post-pass (line 1203-1204)

All parser-mutation regression tests are unaffected — their test schemas
are titled (`Widget`, `StorageBackend`, `Container Mapping`, etc.).

Samples require regeneration after this change.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 docs/customization.md                         |  2 +
 .../codegen/InlineModelResolver.java          |  9 ++
 .../codegen/DefaultCodegenTest.java           | 12 +--
 .../codegen/InlineModelResolverTest.java      | 88 ++++++++++++++++++-
 4 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/docs/customization.md b/docs/customization.md
index 9cf7ee85f7c5..43dd0136ca44 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -532,6 +532,8 @@ Another useful option is `inlineSchemaOptions`, which allows you to customize ho
 - `REFACTOR_ALLOF_INLINE_SCHEMAS=true` will restore the 6.x (or below) behaviour to refactor allOf inline schemas into $ref. (v7.0.0 will skip the refactoring of these allOf inline schemas by default)
 - `RESOLVE_INLINE_ENUMS=true` will refactor inline enum definitions into $ref. This must be activated to allow the renaming of inline enum definitions using `inlineSchemaNameMappings`.
 
+Note: anonymous (untitled) inline schemas are **not** reused across different parent schemas by default (issue #18963). When two parent schemas define structurally identical inline objects without a `title`, each parent gets its own named model (e.g. `Item_user` and `Issue_user`). To have an inline schema reused wherever it appears, add an explicit `title` field — only titled inline schemas are eligible for reuse.
+
 ## OpenAPI Normalizer
 
 OpenAPI Normalizer transforms the input OpenAPI doc/spec (which may not perfectly conform to the specification) to make it workable with OpenAPI Generator. A few rules are switched on by default since 7.0.0 release:
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
index b9ed1c9eba38..52f95ff09baf 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -853,6 +853,15 @@ private String matchGenerated(Schema model) {
         if (skipSchemaReuse) { // skip reusing schema
             return null;
         }
+        // Only titled schemas represent intentionally shared named types eligible for reuse.
+        // Schemas without a meaningful title have context-derived names (e.g. Item_user) that are
+        // arbitrary — reusing one parent's model for a different parent's structurally-identical
+        // inline schema forces a misleading name onto the other context. "Meaningful title" mirrors
+        // the same check in resolveModelName: non-null and not empty after sanitization.
+        String title = model.getTitle();
+        if (title == null || "".equals(sanitizeName(title).replace("_", ""))) {
+            return null;
+        }
 
         try {
             // Exact content match.
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index afd75b3f16f6..04b44281a6df 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -3522,22 +3522,24 @@ public void testVarsAndRequiredVarsPresent() {
         assertEquals(co.bodyParams.get(0).vars, vars);
         assertEquals(co.bodyParams.get(0).requiredVars, requiredVars);
 
-        // CodegenOperation puts the inline schema into schemas and refs it
+        // CodegenOperation puts the inline schema into schemas and refs it; the response gets its
+        // own named model since request and response are anonymous schemas in different contexts
         assertTrue(co.responses.get(0).isModel);
-        assertEquals("objectWithOptionalAndRequiredProps_request", co.responses.get(0).baseType);
-        modelName = "objectWithOptionalAndRequiredProps_request";
+        assertEquals("objectWithOptionalAndRequiredProps_200_response", co.responses.get(0).baseType);
+        modelName = "objectWithOptionalAndRequiredProps_200_response";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         assertEquals(cm.vars, vars);
         assertEquals(cm.requiredVars, requiredVars);
 
-        // CodegenProperty puts the inline schema into schemas and refs it
+        // CodegenProperty puts the inline schema into schemas and refs it; anonymous component
+        // inline property gets its own named model derived from parent schema and property name
         modelName = "ObjectPropContainsProps";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         CodegenProperty cp = cm.getVars().get(0);
         assertTrue(cp.isModel);
-        assertEquals("objectWithOptionalAndRequiredProps_request", cp.complexType);
+        assertEquals("ObjectPropContainsProps_a", cp.complexType);
     }
 
     @Test
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
index 61bf18b51b11..9248f9c28c0d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
@@ -1186,6 +1186,9 @@ public void testInlineSchemaOptions() {
 
     @Test
     public void testInlineSchemaSkipReuseSetToFalse() {
+        // meta_200_response and mega_200_response are anonymous (untitled) inline schemas under
+        // different operations. Anonymous inline schemas are not reused across parents, so both
+        // receive their own named model even though they are structurally identical.
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
         InlineModelResolver resolver = new InlineModelResolver();
         Map<String, String> inlineSchemaOptions = new HashMap<>();
@@ -1197,9 +1200,10 @@ public void testInlineSchemaSkipReuseSetToFalse() {
         assertTrue(schema.getProperties().get("name") instanceof StringSchema);
         assertTrue(schema.getProperties().get("id") instanceof IntegerSchema);
 
-        // mega_200_response is NOT created since meta_200_response is reused
         Schema schema2 = openAPI.getComponents().getSchemas().get("mega_200_response");
-        assertNull(schema2);
+        assertNotNull(schema2);
+        assertTrue(schema2.getProperties().get("name") instanceof StringSchema);
+        assertTrue(schema2.getProperties().get("id") instanceof IntegerSchema);
     }
 
     @Test
@@ -1220,6 +1224,86 @@ public void testInlineSchemaSkipReuseSetToTrue() {
         assertTrue(schema2.getProperties().get("id") instanceof IntegerSchema);
     }
 
+    @Test
+    public void resolveAnonymousInlineSchemaNotReusedAcrossParents() {
+        // Two different component schemas (Item, Issue) each define an anonymous (untitled) inline
+        // `user` object with identical members (id, name). Each parent must produce its own named
+        // model; the name from one parent's context must not be imposed on the other.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+
+        Schema userSchema = new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("name", new StringSchema());
+
+        Schema anotherUserSchema = new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("name", new StringSchema());
+
+        openapi.getComponents().addSchemas("Item", new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("user", userSchema));
+
+        openapi.getComponents().addSchemas("Issue", new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("user", anotherUserSchema));
+
+        new InlineModelResolver().flatten(openapi);
+
+        Map<String, Schema> schemas = openapi.getComponents().getSchemas();
+
+        // Both inline user schemas must exist as separate named models
+        assertNotNull("Item_user model must exist", schemas.get("Item_user"));
+        assertNotNull("Issue_user model must exist", schemas.get("Issue_user"));
+
+        // Item.user must reference its own model
+        Schema itemUser = (Schema) schemas.get("Item").getProperties().get("user");
+        assertEquals("#/components/schemas/Item_user", itemUser.get$ref());
+
+        // Issue.user must reference its own model, not Item_user
+        Schema issueUser = (Schema) schemas.get("Issue").getProperties().get("user");
+        assertEquals("#/components/schemas/Issue_user", issueUser.get$ref());
+    }
+
+    @Test
+    public void resolveTitledInlineSchemaIsReusedAcrossParents() {
+        // A titled inline schema represents a named type that is intentionally shared. When two
+        // different parent schemas each have a property whose inline schema carries the same title
+        // and identical structure, both properties must reference the same named model — only one
+        // entry is created in components, not a numbered variant.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+
+        openapi.getComponents().addSchemas("Item", new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("user", new ObjectSchema()
+                        .title("UserSummary")
+                        .addProperty("id", new StringSchema().format("uuid"))
+                        .addProperty("name", new StringSchema())));
+
+        openapi.getComponents().addSchemas("Issue", new ObjectSchema()
+                .addProperty("id", new StringSchema().format("uuid"))
+                .addProperty("user", new ObjectSchema()
+                        .title("UserSummary")
+                        .addProperty("id", new StringSchema().format("uuid"))
+                        .addProperty("name", new StringSchema())));
+
+        new InlineModelResolver().flatten(openapi);
+
+        Map<String, Schema> schemas = openapi.getComponents().getSchemas();
+
+        // Titled inline schema must be deduplicated — no numbered variant
+        assertNotNull("UserSummary schema must exist", schemas.get("UserSummary"));
+        assertNull("Duplicate UserSummary_1 must not exist", schemas.get("UserSummary_1"));
+
+        // Both parents must reference the same shared model
+        Schema itemUser = (Schema) schemas.get("Item").getProperties().get("user");
+        assertEquals("#/components/schemas/UserSummary", itemUser.get$ref());
+
+        Schema issueUser = (Schema) schemas.get("Issue").getProperties().get("user");
+        assertEquals("#/components/schemas/UserSummary", issueUser.get$ref());
+    }
+
     @Test
     public void resolveInlineRequestBodyAllOf() {
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");

From fa2fe6a5fd9e33432403f9c2f26edb301a3dc28a Mon Sep 17 00:00:00 2001
From: Roemer Vlasveld <roemer.vlasveld@gmail.com>
Date: Wed, 10 Jun 2026 00:29:58 +0200
Subject: [PATCH 2/2] chore: regenerate samples after anonymous inline schema
 dedup change

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../R-httr2-wrapper/.openapi-generator/FILES  |    3 +
 .../client/petstore/R-httr2-wrapper/NAMESPACE |    1 +
 .../R/add_pet_optional_request.R              |  227 ++++
 .../client/petstore/R-httr2-wrapper/README.md |    1 +
 .../docs/AddPetOptionalRequest.md             |   10 +
 .../testthat/test_add_pet_optional_request.R  |   20 +
 .../petstore/R-httr2/.openapi-generator/FILES |    3 +
 samples/client/petstore/R-httr2/NAMESPACE     |    1 +
 .../R-httr2/R/add_pet_optional_request.R      |  196 ++++
 samples/client/petstore/R-httr2/README.md     |    1 +
 .../R-httr2/docs/AddPetOptionalRequest.md     |   10 +
 .../testthat/test_add_pet_optional_request.R  |   20 +
 .../petstore/R/.openapi-generator/FILES       |    3 +
 samples/client/petstore/R/NAMESPACE           |    1 +
 .../petstore/R/R/add_pet_optional_request.R   |  227 ++++
 samples/client/petstore/R/README.md           |    1 +
 .../petstore/R/docs/AddPetOptionalRequest.md  |   10 +
 .../testthat/test_add_pet_optional_request.R  |   20 +
 .../net10/FormModels/.openapi-generator/FILES |   36 +
 .../net10/FormModels/api/openapi.yaml         |  123 +-
 .../net10/FormModels/docs/apis/FakeApi.md     |   10 +-
 .../net10/FormModels/docs/models/EnumTest.md  |    4 +-
 .../docs/models/EnumTestEnumNumber.md         |    9 +
 .../docs/models/EnumTestEnumStringRequired.md |    9 +
 .../FormModels/docs/models/RequiredClass.md   |   12 +-
 ...dClassNotrequiredNotnullableEnumInteger.md |    9 +
 ...ssNotrequiredNotnullableEnumIntegerOnly.md |    9 +
 ...edClassNotrequiredNotnullableEnumString.md |    9 +
 ...iredClassNotrequiredNullableEnumInteger.md |    9 +
 ...ClassNotrequiredNullableEnumIntegerOnly.md |    9 +
 ...uiredClassNotrequiredNullableEnumString.md |    9 +
 ...tersEnumHeaderStringArrayParameterInner.md |    9 +
 ...EnumParametersEnumHeaderStringParameter.md |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../Model/EnumTestEnumNumberTests.cs          |   56 +
 .../Model/EnumTestEnumStringRequiredTests.cs  |   56 +
 ...requiredNotnullableEnumIntegerOnlyTests.cs |   56 +
 ...sNotrequiredNotnullableEnumIntegerTests.cs |   56 +
 ...ssNotrequiredNotnullableEnumStringTests.cs |   56 +
 ...NotrequiredNullableEnumIntegerOnlyTests.cs |   56 +
 ...lassNotrequiredNullableEnumIntegerTests.cs |   56 +
 ...ClassNotrequiredNullableEnumStringTests.cs |   56 +
 ...numHeaderStringArrayParameterInnerTests.cs |   56 +
 ...arametersEnumHeaderStringParameterTests.cs |   56 +
 ...EnumQueryStringArrayParameterInnerTests.cs |   56 +
 ...ParametersEnumQueryStringParameterTests.cs |   56 +
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |   20 +-
 .../Org.OpenAPITools/Client/ClientUtils.cs    |   24 +
 .../Client/HostConfiguration.cs               |   24 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |   20 +-
 .../Model/EnumTestEnumNumber.cs               |  168 +++
 .../Model/EnumTestEnumStringRequired.cs       |  258 +++++
 .../Org.OpenAPITools/Model/RequiredClass.cs   |   62 +-
 ...dClassNotrequiredNotnullableEnumInteger.cs |  168 +++
 ...ssNotrequiredNotnullableEnumIntegerOnly.cs |  168 +++
 ...edClassNotrequiredNotnullableEnumString.cs |  258 +++++
 ...iredClassNotrequiredNullableEnumInteger.cs |  168 +++
 ...ClassNotrequiredNullableEnumIntegerOnly.cs |  168 +++
 ...uiredClassNotrequiredNullableEnumString.cs |  258 +++++
 ...tersEnumHeaderStringArrayParameterInner.cs |  174 +++
 ...EnumParametersEnumHeaderStringParameter.cs |  188 +++
 ...etersEnumQueryStringArrayParameterInner.cs |  174 +++
 ...tEnumParametersEnumQueryStringParameter.cs |  188 +++
 .../FormModels/.openapi-generator/FILES       |   36 +
 .../net4.7/FormModels/api/openapi.yaml        |  123 +-
 .../net4.7/FormModels/docs/apis/FakeApi.md    |   10 +-
 .../net4.7/FormModels/docs/models/EnumTest.md |    4 +-
 .../docs/models/EnumTestEnumNumber.md         |    9 +
 .../docs/models/EnumTestEnumStringRequired.md |    9 +
 .../FormModels/docs/models/RequiredClass.md   |   12 +-
 ...dClassNotrequiredNotnullableEnumInteger.md |    9 +
 ...ssNotrequiredNotnullableEnumIntegerOnly.md |    9 +
 ...edClassNotrequiredNotnullableEnumString.md |    9 +
 ...iredClassNotrequiredNullableEnumInteger.md |    9 +
 ...ClassNotrequiredNullableEnumIntegerOnly.md |    9 +
 ...uiredClassNotrequiredNullableEnumString.md |    9 +
 ...tersEnumHeaderStringArrayParameterInner.md |    9 +
 ...EnumParametersEnumHeaderStringParameter.md |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../Model/EnumTestEnumNumberTests.cs          |   56 +
 .../Model/EnumTestEnumStringRequiredTests.cs  |   56 +
 ...requiredNotnullableEnumIntegerOnlyTests.cs |   56 +
 ...sNotrequiredNotnullableEnumIntegerTests.cs |   56 +
 ...ssNotrequiredNotnullableEnumStringTests.cs |   56 +
 ...NotrequiredNullableEnumIntegerOnlyTests.cs |   56 +
 ...lassNotrequiredNullableEnumIntegerTests.cs |   56 +
 ...ClassNotrequiredNullableEnumStringTests.cs |   56 +
 ...numHeaderStringArrayParameterInnerTests.cs |   56 +
 ...arametersEnumHeaderStringParameterTests.cs |   56 +
 ...EnumQueryStringArrayParameterInnerTests.cs |   56 +
 ...ParametersEnumQueryStringParameterTests.cs |   56 +
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |   20 +-
 .../Org.OpenAPITools/Client/ClientUtils.cs    |   24 +
 .../Client/HostConfiguration.cs               |   24 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |   20 +-
 .../Model/EnumTestEnumNumber.cs               |  168 +++
 .../Model/EnumTestEnumStringRequired.cs       |  258 +++++
 .../Org.OpenAPITools/Model/RequiredClass.cs   |   62 +-
 ...dClassNotrequiredNotnullableEnumInteger.cs |  168 +++
 ...ssNotrequiredNotnullableEnumIntegerOnly.cs |  168 +++
 ...edClassNotrequiredNotnullableEnumString.cs |  258 +++++
 ...iredClassNotrequiredNullableEnumInteger.cs |  168 +++
 ...ClassNotrequiredNullableEnumIntegerOnly.cs |  168 +++
 ...uiredClassNotrequiredNullableEnumString.cs |  258 +++++
 ...tersEnumHeaderStringArrayParameterInner.cs |  174 +++
 ...EnumParametersEnumHeaderStringParameter.cs |  188 +++
 ...etersEnumQueryStringArrayParameterInner.cs |  174 +++
 ...tEnumParametersEnumQueryStringParameter.cs |  188 +++
 .../FormModels/.openapi-generator/FILES       |   36 +
 .../net4.8/FormModels/api/openapi.yaml        |  123 +-
 .../net4.8/FormModels/docs/apis/FakeApi.md    |   10 +-
 .../net4.8/FormModels/docs/models/EnumTest.md |    4 +-
 .../docs/models/EnumTestEnumNumber.md         |    9 +
 .../docs/models/EnumTestEnumStringRequired.md |    9 +
 .../FormModels/docs/models/RequiredClass.md   |   12 +-
 ...dClassNotrequiredNotnullableEnumInteger.md |    9 +
 ...ssNotrequiredNotnullableEnumIntegerOnly.md |    9 +
 ...edClassNotrequiredNotnullableEnumString.md |    9 +
 ...iredClassNotrequiredNullableEnumInteger.md |    9 +
 ...ClassNotrequiredNullableEnumIntegerOnly.md |    9 +
 ...uiredClassNotrequiredNullableEnumString.md |    9 +
 ...tersEnumHeaderStringArrayParameterInner.md |    9 +
 ...EnumParametersEnumHeaderStringParameter.md |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../Model/EnumTestEnumNumberTests.cs          |   56 +
 .../Model/EnumTestEnumStringRequiredTests.cs  |   56 +
 ...requiredNotnullableEnumIntegerOnlyTests.cs |   56 +
 ...sNotrequiredNotnullableEnumIntegerTests.cs |   56 +
 ...ssNotrequiredNotnullableEnumStringTests.cs |   56 +
 ...NotrequiredNullableEnumIntegerOnlyTests.cs |   56 +
 ...lassNotrequiredNullableEnumIntegerTests.cs |   56 +
 ...ClassNotrequiredNullableEnumStringTests.cs |   56 +
 ...numHeaderStringArrayParameterInnerTests.cs |   56 +
 ...arametersEnumHeaderStringParameterTests.cs |   56 +
 ...EnumQueryStringArrayParameterInnerTests.cs |   56 +
 ...ParametersEnumQueryStringParameterTests.cs |   56 +
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |   20 +-
 .../Org.OpenAPITools/Client/ClientUtils.cs    |   24 +
 .../Client/HostConfiguration.cs               |   24 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |   20 +-
 .../Model/EnumTestEnumNumber.cs               |  168 +++
 .../Model/EnumTestEnumStringRequired.cs       |  258 +++++
 .../Org.OpenAPITools/Model/RequiredClass.cs   |   62 +-
 ...dClassNotrequiredNotnullableEnumInteger.cs |  168 +++
 ...ssNotrequiredNotnullableEnumIntegerOnly.cs |  168 +++
 ...edClassNotrequiredNotnullableEnumString.cs |  258 +++++
 ...iredClassNotrequiredNullableEnumInteger.cs |  168 +++
 ...ClassNotrequiredNullableEnumIntegerOnly.cs |  168 +++
 ...uiredClassNotrequiredNullableEnumString.cs |  258 +++++
 ...tersEnumHeaderStringArrayParameterInner.cs |  174 +++
 ...EnumParametersEnumHeaderStringParameter.cs |  188 +++
 ...etersEnumQueryStringArrayParameterInner.cs |  174 +++
 ...tEnumParametersEnumQueryStringParameter.cs |  188 +++
 .../net8/FormModels/.openapi-generator/FILES  |   36 +
 .../net8/FormModels/api/openapi.yaml          |  123 +-
 .../net8/FormModels/docs/apis/FakeApi.md      |   10 +-
 .../net8/FormModels/docs/models/EnumTest.md   |    4 +-
 .../docs/models/EnumTestEnumNumber.md         |    9 +
 .../docs/models/EnumTestEnumStringRequired.md |    9 +
 .../FormModels/docs/models/RequiredClass.md   |   12 +-
 ...dClassNotrequiredNotnullableEnumInteger.md |    9 +
 ...ssNotrequiredNotnullableEnumIntegerOnly.md |    9 +
 ...edClassNotrequiredNotnullableEnumString.md |    9 +
 ...iredClassNotrequiredNullableEnumInteger.md |    9 +
 ...ClassNotrequiredNullableEnumIntegerOnly.md |    9 +
 ...uiredClassNotrequiredNullableEnumString.md |    9 +
 ...tersEnumHeaderStringArrayParameterInner.md |    9 +
 ...EnumParametersEnumHeaderStringParameter.md |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../Model/EnumTestEnumNumberTests.cs          |   56 +
 .../Model/EnumTestEnumStringRequiredTests.cs  |   56 +
 ...requiredNotnullableEnumIntegerOnlyTests.cs |   56 +
 ...sNotrequiredNotnullableEnumIntegerTests.cs |   56 +
 ...ssNotrequiredNotnullableEnumStringTests.cs |   56 +
 ...NotrequiredNullableEnumIntegerOnlyTests.cs |   56 +
 ...lassNotrequiredNullableEnumIntegerTests.cs |   56 +
 ...ClassNotrequiredNullableEnumStringTests.cs |   56 +
 ...numHeaderStringArrayParameterInnerTests.cs |   56 +
 ...arametersEnumHeaderStringParameterTests.cs |   56 +
 ...EnumQueryStringArrayParameterInnerTests.cs |   56 +
 ...ParametersEnumQueryStringParameterTests.cs |   56 +
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |   20 +-
 .../Org.OpenAPITools/Client/ClientUtils.cs    |   24 +
 .../Client/HostConfiguration.cs               |   24 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |   20 +-
 .../Model/EnumTestEnumNumber.cs               |  168 +++
 .../Model/EnumTestEnumStringRequired.cs       |  258 +++++
 .../Org.OpenAPITools/Model/RequiredClass.cs   |   62 +-
 ...dClassNotrequiredNotnullableEnumInteger.cs |  168 +++
 ...ssNotrequiredNotnullableEnumIntegerOnly.cs |  168 +++
 ...edClassNotrequiredNotnullableEnumString.cs |  258 +++++
 ...iredClassNotrequiredNullableEnumInteger.cs |  168 +++
 ...ClassNotrequiredNullableEnumIntegerOnly.cs |  168 +++
 ...uiredClassNotrequiredNullableEnumString.cs |  258 +++++
 ...tersEnumHeaderStringArrayParameterInner.cs |  174 +++
 ...EnumParametersEnumHeaderStringParameter.cs |  188 +++
 ...etersEnumQueryStringArrayParameterInner.cs |  174 +++
 ...tEnumParametersEnumQueryStringParameter.cs |  188 +++
 .../net9/FormModels/.openapi-generator/FILES  |   36 +
 .../net9/FormModels/api/openapi.yaml          |  123 +-
 .../net9/FormModels/docs/apis/FakeApi.md      |   10 +-
 .../net9/FormModels/docs/models/EnumTest.md   |    4 +-
 .../docs/models/EnumTestEnumNumber.md         |    9 +
 .../docs/models/EnumTestEnumStringRequired.md |    9 +
 .../FormModels/docs/models/RequiredClass.md   |   12 +-
 ...dClassNotrequiredNotnullableEnumInteger.md |    9 +
 ...ssNotrequiredNotnullableEnumIntegerOnly.md |    9 +
 ...edClassNotrequiredNotnullableEnumString.md |    9 +
 ...iredClassNotrequiredNullableEnumInteger.md |    9 +
 ...ClassNotrequiredNullableEnumIntegerOnly.md |    9 +
 ...uiredClassNotrequiredNullableEnumString.md |    9 +
 ...tersEnumHeaderStringArrayParameterInner.md |    9 +
 ...EnumParametersEnumHeaderStringParameter.md |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../Model/EnumTestEnumNumberTests.cs          |   56 +
 .../Model/EnumTestEnumStringRequiredTests.cs  |   56 +
 ...requiredNotnullableEnumIntegerOnlyTests.cs |   56 +
 ...sNotrequiredNotnullableEnumIntegerTests.cs |   56 +
 ...ssNotrequiredNotnullableEnumStringTests.cs |   56 +
 ...NotrequiredNullableEnumIntegerOnlyTests.cs |   56 +
 ...lassNotrequiredNullableEnumIntegerTests.cs |   56 +
 ...ClassNotrequiredNullableEnumStringTests.cs |   56 +
 ...numHeaderStringArrayParameterInnerTests.cs |   56 +
 ...arametersEnumHeaderStringParameterTests.cs |   56 +
 ...EnumQueryStringArrayParameterInnerTests.cs |   56 +
 ...ParametersEnumQueryStringParameterTests.cs |   56 +
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |   20 +-
 .../Org.OpenAPITools/Client/ClientUtils.cs    |   24 +
 .../Client/HostConfiguration.cs               |   24 +
 .../src/Org.OpenAPITools/Model/EnumTest.cs    |   20 +-
 .../Model/EnumTestEnumNumber.cs               |  168 +++
 .../Model/EnumTestEnumStringRequired.cs       |  258 +++++
 .../Org.OpenAPITools/Model/RequiredClass.cs   |   62 +-
 ...dClassNotrequiredNotnullableEnumInteger.cs |  168 +++
 ...ssNotrequiredNotnullableEnumIntegerOnly.cs |  168 +++
 ...edClassNotrequiredNotnullableEnumString.cs |  258 +++++
 ...iredClassNotrequiredNullableEnumInteger.cs |  168 +++
 ...ClassNotrequiredNullableEnumIntegerOnly.cs |  168 +++
 ...uiredClassNotrequiredNullableEnumString.cs |  258 +++++
 ...tersEnumHeaderStringArrayParameterInner.cs |  174 +++
 ...EnumParametersEnumHeaderStringParameter.cs |  188 +++
 ...etersEnumQueryStringArrayParameterInner.cs |  174 +++
 ...tEnumParametersEnumQueryStringParameter.cs |  188 +++
 .../java/okhttp-gson/api/openapi.yaml         |   12 +-
 .../.openapi-generator/FILES                  |    1 +
 .../src/models/some_object.ml                 |    4 +-
 .../some_object_optional_field3_value.ml      |   31 +
 .../.openapi-generator/FILES                  |    2 +
 .../api.ts                                    |    6 +
 .../docs/FooGet404Response.md                 |   20 +
 .../docs/FooGet4XXResponse.md                 |   20 +
 .../builds/enum/.openapi-generator/FILES      |    4 +
 .../builds/enum/apis/DefaultApi.ts            |   24 +-
 .../builds/enum/docs/DefaultApi.md            |   16 +-
 .../FakeEnumRequestPostInline200Response.md   |   40 +
 .../docs/FakeEnumRequestPostInlineRequest.md  |   40 +
 .../FakeEnumRequestPostInline200Response.ts   |  131 +++
 .../FakeEnumRequestPostInlineRequest.ts       |   49 +-
 .../builds/enum/models/index.ts               |    2 +
 .../.openapi-generator/FILES                  |    4 +
 .../with-string-enums/apis/DefaultApi.ts      |   24 +-
 .../with-string-enums/docs/DefaultApi.md      |   16 +-
 .../FakeEnumRequestPostInline200Response.md   |   40 +
 .../docs/FakeEnumRequestPostInlineRequest.md  |   40 +
 .../FakeEnumRequestPostInline200Response.ts   |  127 +++
 .../FakeEnumRequestPostInlineRequest.ts       |   49 +-
 .../builds/with-string-enums/models/index.ts  |    2 +
 .../go/go-petstore/.openapi-generator/FILES   |    4 +
 .../client/petstore/go/go-petstore/README.md  |    2 +
 .../petstore/go/go-petstore/api/openapi.yaml  |   28 +-
 .../petstore/go/go-petstore/api_default.go    |    4 +-
 .../go/go-petstore/docs/FooGet404Response.md  |   56 +
 .../go/go-petstore/docs/FooGet4XXResponse.md  |   56 +
 .../model__foo_get_404_response.go            |  155 +++
 .../model__foo_get_4_xx_response.go           |  155 +++
 .../python-aiohttp/.openapi-generator/FILES   |    2 +
 .../client/petstore/python-aiohttp/README.md  |    1 +
 .../petstore/python-aiohttp/docs/FakeApi.md   |    6 +-
 .../python-aiohttp/petstore_api/__init__.py   |    2 +
 .../petstore_api/api/fake_api.py              |   13 +-
 .../petstore_api/models/__init__.py           |    1 +
 .../python-httpx/.openapi-generator/FILES     |    2 +
 .../client/petstore/python-httpx/README.md    |    1 +
 .../petstore/python-httpx/docs/FakeApi.md     |    6 +-
 .../python-httpx/petstore_api/__init__.py     |    2 +
 .../python-httpx/petstore_api/api/fake_api.py |   13 +-
 .../petstore_api/models/__init__.py           |    1 +
 .../.openapi-generator/FILES                  |    2 +
 .../petstore/python-lazyImports/README.md     |    1 +
 .../python-lazyImports/docs/FakeApi.md        |    6 +-
 .../petstore_api/__init__.py                  |    3 +
 .../petstore_api/api/fake_api.py              |   13 +-
 .../petstore_api/models/__init__.py           |    2 +
 .../.openapi-generator/FILES                  |    2 +
 .../python-pydantic-v1-aiohttp/README.md      |    1 +
 .../docs/FakeApi.md                           |    6 +-
 .../petstore_api/__init__.py                  |    2 +
 .../petstore_api/api/fake_api.py              |    9 +-
 .../petstore_api/models/__init__.py           |    1 +
 .../.openapi-generator/FILES                  |    2 +
 .../petstore/python-pydantic-v1/README.md     |    1 +
 .../python-pydantic-v1/docs/FakeApi.md        |    6 +-
 .../petstore_api/__init__.py                  |    2 +
 .../petstore_api/api/fake_api.py              |    9 +-
 .../petstore_api/models/__init__.py           |    1 +
 .../petstore/python/.openapi-generator/FILES  |    2 +
 .../openapi3/client/petstore/python/README.md |    1 +
 .../client/petstore/python/docs/FakeApi.md    |    6 +-
 .../petstore/python/petstore_api/__init__.py  |    2 +
 .../python/petstore_api/api/fake_api.py       |   13 +-
 .../python/petstore_api/models/__init__.py    |    1 +
 .../.openapi-generator/FILES                  |    1 +
 .../no-body-path-params/api/openapi.yaml      |    7 +-
 .../go-server/no-body-path-params/go/api.go   |    2 +-
 .../no-body-path-params/go/api_both.go        |   10 +-
 .../go/api_both_service.go                    |    2 +-
 .../go/model_both_request.go                  |   29 +
 .../php-laravel/.openapi-generator/FILES      |    6 +
 .../php-laravel/Api/FakeApiInterface.php      |   12 +-
 .../Http/Controllers/FakeController.php       |    4 +-
 .../petstore/php-laravel/Model/EnumTest.php   |    8 +-
 .../php-laravel/Model/EnumTestEnumNumber.php  |   33 +
 .../Model/EnumTestEnumStringRequired.php      |   34 +
 ...ersEnumHeaderStringArrayParameterInner.php |   33 +
 ...tersEnumQueryStringArrayParameterInner.php |   33 +
 ...EnumParametersEnumQueryStringParameter.php |   34 +
 .../multipart-v3/.openapi-generator/FILES     |    1 +
 .../output/multipart-v3/README.md             |    1 +
 .../output/multipart-v3/api/openapi.yaml      |   13 +-
 .../output/multipart-v3/bin/cli.rs            |    2 +-
 .../docs/MultipartRelatedRequest.md           |    2 +-
 .../MultipartRelatedRequestObjectField.md     |   11 +
 .../output/multipart-v3/docs/default_api.md   |    2 +-
 .../multipart-v3/examples/server/server.rs    |    2 +-
 .../output/multipart-v3/src/client/mod.rs     |    2 +-
 .../output/multipart-v3/src/lib.rs            |    6 +-
 .../output/multipart-v3/src/models.rs         |  176 ++-
 .../output/multipart-v3/src/server/mod.rs     |    6 +-
 .../.openapi-generator/FILES                  |    7 +
 .../README.md                                 |    7 +
 .../api/openapi.yaml                          |   56 +-
 .../bin/cli.rs                                |    6 +-
 .../docs/ArrayTest.md                         |    2 +-
 .../docs/ArrayTestArrayOfEnumInner.md         |    9 +
 .../docs/EnumTest.md                          |    4 +-
 .../docs/EnumTestEnumNumber.md                |    9 +
 .../docs/EnumTestEnumStringRequired.md        |    9 +
 .../docs/MapTest.md                           |    2 +-
 .../docs/MapTestMapOfEnumStringValue.md       |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../docs/fake_api.md                          |    2 +-
 .../examples/client/main.rs                   |    4 +-
 .../examples/server/server.rs                 |    6 +-
 .../src/client/mod.rs                         |    6 +-
 .../src/lib.rs                                |   18 +-
 .../src/models.rs                             | 1004 ++++++++++++++--
 .../src/server/mod.rs                         |    4 +-
 .../multipart-v3/.openapi-generator/FILES     |    1 +
 .../rust-server/output/multipart-v3/README.md |    1 +
 .../output/multipart-v3/api/openapi.yaml      |   13 +-
 .../output/multipart-v3/bin/cli.rs            |    4 +-
 .../docs/MultipartRelatedRequest.md           |    2 +-
 .../MultipartRelatedRequestObjectField.md     |   11 +
 .../output/multipart-v3/docs/default_api.md   |    2 +-
 .../multipart-v3/examples/server/server.rs    |    2 +-
 .../output/multipart-v3/src/client/mod.rs     |    2 +-
 .../output/multipart-v3/src/lib.rs            |    6 +-
 .../output/multipart-v3/src/models.rs         |  198 +++-
 .../output/multipart-v3/src/server/mod.rs     |    6 +-
 .../.openapi-generator/FILES                  |    7 +
 .../README.md                                 |    7 +
 .../api/openapi.yaml                          |   56 +-
 .../bin/cli.rs                                |   12 +-
 .../docs/ArrayTest.md                         |    2 +-
 .../docs/ArrayTestArrayOfEnumInner.md         |    9 +
 .../docs/EnumTest.md                          |    4 +-
 .../docs/EnumTestEnumNumber.md                |    9 +
 .../docs/EnumTestEnumStringRequired.md        |    9 +
 .../docs/MapTest.md                           |    2 +-
 .../docs/MapTestMapOfEnumStringValue.md       |    9 +
 ...etersEnumQueryStringArrayParameterInner.md |    9 +
 ...tEnumParametersEnumQueryStringParameter.md |    9 +
 .../docs/fake_api.md                          |    2 +-
 .../examples/client/main.rs                   |    4 +-
 .../examples/server/server.rs                 |    6 +-
 .../src/client/mod.rs                         |    6 +-
 .../src/lib.rs                                |   18 +-
 .../src/models.rs                             | 1007 +++++++++++++++--
 .../src/server/mod.rs                         |    4 +-
 395 files changed, 21656 insertions(+), 765 deletions(-)
 create mode 100644 samples/client/petstore/R-httr2-wrapper/R/add_pet_optional_request.R
 create mode 100644 samples/client/petstore/R-httr2-wrapper/docs/AddPetOptionalRequest.md
 create mode 100644 samples/client/petstore/R-httr2-wrapper/tests/testthat/test_add_pet_optional_request.R
 create mode 100644 samples/client/petstore/R-httr2/R/add_pet_optional_request.R
 create mode 100644 samples/client/petstore/R-httr2/docs/AddPetOptionalRequest.md
 create mode 100644 samples/client/petstore/R-httr2/tests/testthat/test_add_pet_optional_request.R
 create mode 100644 samples/client/petstore/R/R/add_pet_optional_request.R
 create mode 100644 samples/client/petstore/R/docs/AddPetOptionalRequest.md
 create mode 100644 samples/client/petstore/R/tests/testthat/test_add_pet_optional_request.R
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumNumber.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumStringRequired.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumNumber.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumStringRequired.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumNumber.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumStringRequired.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumNumber.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumStringRequired.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumNumber.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumStringRequired.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
 create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 create mode 100644 samples/client/petstore/ocaml-additional-properties/src/models/some_object_optional_field3_value.ml
 create mode 100644 samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet404Response.md
 create mode 100644 samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet4XXResponse.md
 create mode 100644 samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInline200Response.md
 create mode 100644 samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInlineRequest.md
 create mode 100644 samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInline200Response.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInline200Response.md
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInlineRequest.md
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInline200Response.ts
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/docs/FooGet404Response.md
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/docs/FooGet4XXResponse.md
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/model__foo_get_404_response.go
 create mode 100644 samples/openapi3/client/petstore/go/go-petstore/model__foo_get_4_xx_response.go
 create mode 100644 samples/server/others/go-server/no-body-path-params/go/model_both_request.go
 create mode 100644 samples/server/petstore/php-laravel/Model/EnumTestEnumNumber.php
 create mode 100644 samples/server/petstore/php-laravel/Model/EnumTestEnumStringRequired.php
 create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.php
 create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringArrayParameterInner.php
 create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringParameter.php
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md
 create mode 100644 samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
 create mode 100644 samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md

diff --git a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/FILES b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/FILES
index 379998b2a2b8..1de49d810b3e 100644
--- a/samples/client/petstore/R-httr2-wrapper/.openapi-generator/FILES
+++ b/samples/client/petstore/R-httr2-wrapper/.openapi-generator/FILES
@@ -5,6 +5,7 @@
 .travis.yml
 DESCRIPTION
 NAMESPACE
+R/add_pet_optional_request.R
 R/allof_tag_api_response.R
 R/animal.R
 R/any_of_pig.R
@@ -40,6 +41,7 @@ R/user_api.R
 R/whale.R
 R/zebra.R
 README.md
+docs/AddPetOptionalRequest.md
 docs/AllofTagApiResponse.md
 docs/Animal.md
 docs/AnyOfPig.md
@@ -72,3 +74,4 @@ docs/Whale.md
 docs/Zebra.md
 git_push.sh
 tests/testthat.R
+tests/testthat/test_add_pet_optional_request.R
diff --git a/samples/client/petstore/R-httr2-wrapper/NAMESPACE b/samples/client/petstore/R-httr2-wrapper/NAMESPACE
index fd66fd4ef7e8..ae27bfb5ee03 100644
--- a/samples/client/petstore/R-httr2-wrapper/NAMESPACE
+++ b/samples/client/petstore/R-httr2-wrapper/NAMESPACE
@@ -16,6 +16,7 @@ export(ApiResponse)
 export(ApiException)
 
 # Models
+export(AddPetOptionalRequest)
 export(AllofTagApiResponse)
 export(Animal)
 export(AnyOfPig)
diff --git a/samples/client/petstore/R-httr2-wrapper/R/add_pet_optional_request.R b/samples/client/petstore/R-httr2-wrapper/R/add_pet_optional_request.R
new file mode 100644
index 000000000000..948795ab180d
--- /dev/null
+++ b/samples/client/petstore/R-httr2-wrapper/R/add_pet_optional_request.R
@@ -0,0 +1,227 @@
+#' Create a new AddPetOptionalRequest
+#'
+#' @description
+#' AddPetOptionalRequest Class
+#'
+#' @docType class
+#' @title AddPetOptionalRequest
+#' @description AddPetOptionalRequest Class
+#' @format An \code{R6Class} generator object
+#' @field jsonData  \link{Pet} [optional]
+#' @field binaryDataN2Information  data.frame [optional]
+#' @field _field_list a list of fields list(character)
+#' @field additional_properties additional properties list(character) [optional]
+#' @importFrom R6 R6Class
+#' @importFrom jsonlite fromJSON toJSON
+#' @export
+AddPetOptionalRequest <- R6::R6Class(
+  "AddPetOptionalRequest",
+  public = list(
+    `jsonData` = NULL,
+    `binaryDataN2Information` = NULL,
+    `_field_list` = c("jsonData", "binaryDataN2Information"),
+    `additional_properties` = list(),
+
+    #' @description
+    #' Initialize a new AddPetOptionalRequest class.
+    #'
+    #' @param jsonData jsonData
+    #' @param binaryDataN2Information binaryDataN2Information
+    #' @param additional_properties additional properties (optional)
+    #' @param ... Other optional arguments.
+    initialize = function(`jsonData` = NULL, `binaryDataN2Information` = NULL, additional_properties = NULL, ...) {
+      if (!is.null(`jsonData`)) {
+        stopifnot(R6::is.R6(`jsonData`))
+        self$`jsonData` <- `jsonData`
+      }
+      if (!is.null(`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- `binaryDataN2Information`
+      }
+      if (!is.null(additional_properties)) {
+        for (key in names(additional_properties)) {
+          self$additional_properties[[key]] <- additional_properties[[key]]
+        }
+      }
+    },
+
+    #' @description
+    #' Convert to an R object. This method is deprecated. Use `toSimpleType()` instead.
+    toJSON = function() {
+      .Deprecated(new = "toSimpleType", msg = "Use the '$toSimpleType()' method instead since that is more clearly named. Use '$toJSONString()' to get a JSON string")
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert to a List
+    #'
+    #' Convert the R6 object to a list to work more easily with other tooling.
+    #'
+    #' @return AddPetOptionalRequest as a base R list.
+    #' @examples
+    #' # convert array of AddPetOptionalRequest (x) to a data frame
+    #' \dontrun{
+    #' library(purrr)
+    #' library(tibble)
+    #' df <- x |> map(\(y)y$toList()) |> map(as_tibble) |> list_rbind()
+    #' df
+    #' }
+    toList = function() {
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert AddPetOptionalRequest to a base R type
+    #'
+    #' @return A base R type, e.g. a list or numeric/character array.
+    toSimpleType = function() {
+      AddPetOptionalRequestObject <- list()
+      if (!is.null(self$`jsonData`)) {
+        AddPetOptionalRequestObject[["jsonData"]] <-
+          self$extractSimpleType(self$`jsonData`)
+      }
+      if (!is.null(self$`binaryDataN2Information`)) {
+        AddPetOptionalRequestObject[["binaryDataN2Information"]] <-
+          self$`binaryDataN2Information`
+      }
+      for (key in names(self$additional_properties)) {
+        AddPetOptionalRequestObject[[key]] <- self$additional_properties[[key]]
+      }
+
+      return(AddPetOptionalRequestObject)
+    },
+
+    extractSimpleType = function(x) {
+      if (R6::is.R6(x)) {
+        return(x$toSimpleType())
+      } else if (!self$hasNestedR6(x)) {
+        return(x)
+      }
+      lapply(x, self$extractSimpleType)
+    },
+
+    hasNestedR6 = function(x) {
+      if (R6::is.R6(x)) {
+        return(TRUE)
+      }
+      if (is.list(x)) {
+        for (item in x) {
+          if (self$hasNestedR6(item)) {
+            return(TRUE)
+          }
+        }
+      }
+      FALSE
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSON = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      if (!is.null(this_object$`jsonData`)) {
+        `jsondata_object` <- Pet$new()
+        `jsondata_object`$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+        self$`jsonData` <- `jsondata_object`
+      }
+      if (!is.null(this_object$`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      }
+      # process additional properties/fields in the payload
+      for (key in names(this_object)) {
+        if (!(key %in% self$`_field_list`)) { # json key not in list of fields
+          self$additional_properties[[key]] <- this_object[[key]]
+        }
+      }
+
+      self
+    },
+
+    #' @description
+    #' To JSON String
+    #' 
+    #' @param ... Parameters passed to `jsonlite::toJSON`
+    #' @return AddPetOptionalRequest in JSON format
+    toJSONString = function(...) {
+      simple <- self$toSimpleType()
+      for (key in names(self$additional_properties)) {
+        simple[[key]] <- self$additional_properties[[key]]
+      }
+      json <- jsonlite::toJSON(simple, auto_unbox = TRUE, digits = NA, ...)
+      return(as.character(jsonlite::minify(json)))
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSONString = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      self$`jsonData` <- Pet$new()$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+      self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      # process additional properties/fields in the payload
+      for (key in names(this_object)) {
+        if (!(key %in% self$`_field_list`)) { # json key not in list of fields
+          self$additional_properties[[key]] <- this_object[[key]]
+        }
+      }
+
+      self
+    },
+
+    #' @description
+    #' Validate JSON input with respect to AddPetOptionalRequest and throw an exception if invalid
+    #'
+    #' @param input the JSON input
+    validateJSON = function(input) {
+      input_json <- jsonlite::fromJSON(input)
+    },
+
+    #' @description
+    #' To string (JSON format)
+    #'
+    #' @return String representation of AddPetOptionalRequest
+    toString = function() {
+      self$toJSONString()
+    },
+
+    #' @description
+    #' Return true if the values in all fields are valid.
+    #'
+    #' @return true if the values in all fields are valid.
+    isValid = function() {
+      TRUE
+    },
+
+    #' @description
+    #' Return a list of invalid fields (if any).
+    #'
+    #' @return A list of invalid fields (if any).
+    getInvalidFields = function() {
+      invalid_fields <- list()
+      invalid_fields
+    },
+
+    #' @description
+    #' Print the object
+    print = function() {
+      print(jsonlite::prettify(self$toJSONString()))
+      invisible(self)
+    }
+  ),
+  # Lock the class to prevent modifications to the method or field
+  lock_class = TRUE
+)
+## Uncomment below to unlock the class to allow modifications of the method or field
+# AddPetOptionalRequest$unlock()
+#
+## Below is an example to define the print function
+# AddPetOptionalRequest$set("public", "print", function(...) {
+#   print(jsonlite::prettify(self$toJSONString()))
+#   invisible(self)
+# })
+## Uncomment below to lock the class to prevent modifications to the method or field
+# AddPetOptionalRequest$lock()
+
diff --git a/samples/client/petstore/R-httr2-wrapper/README.md b/samples/client/petstore/R-httr2-wrapper/README.md
index a31e5867b80b..489ef1757908 100644
--- a/samples/client/petstore/R-httr2-wrapper/README.md
+++ b/samples/client/petstore/R-httr2-wrapper/README.md
@@ -104,6 +104,7 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AddPetOptionalRequest](docs/AddPetOptionalRequest.md)
  - [AllofTagApiResponse](docs/AllofTagApiResponse.md)
  - [Animal](docs/Animal.md)
  - [AnyOfPig](docs/AnyOfPig.md)
diff --git a/samples/client/petstore/R-httr2-wrapper/docs/AddPetOptionalRequest.md b/samples/client/petstore/R-httr2-wrapper/docs/AddPetOptionalRequest.md
new file mode 100644
index 000000000000..5a42fb097855
--- /dev/null
+++ b/samples/client/petstore/R-httr2-wrapper/docs/AddPetOptionalRequest.md
@@ -0,0 +1,10 @@
+# petstore::AddPetOptionalRequest
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**jsonData** | [**Pet**](Pet.md) |  | [optional] 
+**binaryDataN2Information** | **data.frame** |  | [optional] 
+
+
diff --git a/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_add_pet_optional_request.R b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_add_pet_optional_request.R
new file mode 100644
index 000000000000..86ca36b17353
--- /dev/null
+++ b/samples/client/petstore/R-httr2-wrapper/tests/testthat/test_add_pet_optional_request.R
@@ -0,0 +1,20 @@
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+
+context("Test AddPetOptionalRequest")
+
+model_instance <- AddPetOptionalRequest$new()
+
+test_that("jsonData", {
+  # tests for the property `jsonData` (Pet)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`jsonData`, "EXPECTED_RESULT")
+})
+
+test_that("binaryDataN2Information", {
+  # tests for the property `binaryDataN2Information` (data.frame)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`binaryDataN2Information`, "EXPECTED_RESULT")
+})
diff --git a/samples/client/petstore/R-httr2/.openapi-generator/FILES b/samples/client/petstore/R-httr2/.openapi-generator/FILES
index 07243c898d78..831b668b981d 100644
--- a/samples/client/petstore/R-httr2/.openapi-generator/FILES
+++ b/samples/client/petstore/R-httr2/.openapi-generator/FILES
@@ -5,6 +5,7 @@
 .travis.yml
 DESCRIPTION
 NAMESPACE
+R/add_pet_optional_request.R
 R/allof_tag_api_response.R
 R/animal.R
 R/any_of_pig.R
@@ -39,6 +40,7 @@ R/user_api.R
 R/whale.R
 R/zebra.R
 README.md
+docs/AddPetOptionalRequest.md
 docs/AllofTagApiResponse.md
 docs/Animal.md
 docs/AnyOfPig.md
@@ -71,3 +73,4 @@ docs/Whale.md
 docs/Zebra.md
 git_push.sh
 tests/testthat.R
+tests/testthat/test_add_pet_optional_request.R
diff --git a/samples/client/petstore/R-httr2/NAMESPACE b/samples/client/petstore/R-httr2/NAMESPACE
index 29a7f89e22fd..0cdc744adab4 100644
--- a/samples/client/petstore/R-httr2/NAMESPACE
+++ b/samples/client/petstore/R-httr2/NAMESPACE
@@ -14,6 +14,7 @@ export(ApiResponse)
 export(ApiException)
 
 # Models
+export(AddPetOptionalRequest)
 export(AllofTagApiResponse)
 export(Animal)
 export(AnyOfPig)
diff --git a/samples/client/petstore/R-httr2/R/add_pet_optional_request.R b/samples/client/petstore/R-httr2/R/add_pet_optional_request.R
new file mode 100644
index 000000000000..5090e4e2b46d
--- /dev/null
+++ b/samples/client/petstore/R-httr2/R/add_pet_optional_request.R
@@ -0,0 +1,196 @@
+#' Create a new AddPetOptionalRequest
+#'
+#' @description
+#' AddPetOptionalRequest Class
+#'
+#' @docType class
+#' @title AddPetOptionalRequest
+#' @description AddPetOptionalRequest Class
+#' @format An \code{R6Class} generator object
+#' @field jsonData  \link{Pet} [optional]
+#' @field binaryDataN2Information  data.frame [optional]
+#' @importFrom R6 R6Class
+#' @importFrom jsonlite fromJSON toJSON
+#' @export
+AddPetOptionalRequest <- R6::R6Class(
+  "AddPetOptionalRequest",
+  public = list(
+    `jsonData` = NULL,
+    `binaryDataN2Information` = NULL,
+
+    #' @description
+    #' Initialize a new AddPetOptionalRequest class.
+    #'
+    #' @param jsonData jsonData
+    #' @param binaryDataN2Information binaryDataN2Information
+    #' @param ... Other optional arguments.
+    initialize = function(`jsonData` = NULL, `binaryDataN2Information` = NULL, ...) {
+      if (!is.null(`jsonData`)) {
+        stopifnot(R6::is.R6(`jsonData`))
+        self$`jsonData` <- `jsonData`
+      }
+      if (!is.null(`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- `binaryDataN2Information`
+      }
+    },
+
+    #' @description
+    #' Convert to an R object. This method is deprecated. Use `toSimpleType()` instead.
+    toJSON = function() {
+      .Deprecated(new = "toSimpleType", msg = "Use the '$toSimpleType()' method instead since that is more clearly named. Use '$toJSONString()' to get a JSON string")
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert to a List
+    #'
+    #' Convert the R6 object to a list to work more easily with other tooling.
+    #'
+    #' @return AddPetOptionalRequest as a base R list.
+    #' @examples
+    #' # convert array of AddPetOptionalRequest (x) to a data frame
+    #' \dontrun{
+    #' library(purrr)
+    #' library(tibble)
+    #' df <- x |> map(\(y)y$toList()) |> map(as_tibble) |> list_rbind()
+    #' df
+    #' }
+    toList = function() {
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert AddPetOptionalRequest to a base R type
+    #'
+    #' @return A base R type, e.g. a list or numeric/character array.
+    toSimpleType = function() {
+      AddPetOptionalRequestObject <- list()
+      if (!is.null(self$`jsonData`)) {
+        AddPetOptionalRequestObject[["jsonData"]] <-
+          self$extractSimpleType(self$`jsonData`)
+      }
+      if (!is.null(self$`binaryDataN2Information`)) {
+        AddPetOptionalRequestObject[["binaryDataN2Information"]] <-
+          self$`binaryDataN2Information`
+      }
+      return(AddPetOptionalRequestObject)
+    },
+
+    extractSimpleType = function(x) {
+      if (R6::is.R6(x)) {
+        return(x$toSimpleType())
+      } else if (!self$hasNestedR6(x)) {
+        return(x)
+      }
+      lapply(x, self$extractSimpleType)
+    },
+
+    hasNestedR6 = function(x) {
+      if (R6::is.R6(x)) {
+        return(TRUE)
+      }
+      if (is.list(x)) {
+        for (item in x) {
+          if (self$hasNestedR6(item)) {
+            return(TRUE)
+          }
+        }
+      }
+      FALSE
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSON = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      if (!is.null(this_object$`jsonData`)) {
+        `jsondata_object` <- Pet$new()
+        `jsondata_object`$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+        self$`jsonData` <- `jsondata_object`
+      }
+      if (!is.null(this_object$`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      }
+      self
+    },
+
+    #' @description
+    #' To JSON String
+    #' 
+    #' @param ... Parameters passed to `jsonlite::toJSON`
+    #' @return AddPetOptionalRequest in JSON format
+    toJSONString = function(...) {
+      simple <- self$toSimpleType()
+      json <- jsonlite::toJSON(simple, auto_unbox = TRUE, digits = NA, ...)
+      return(as.character(jsonlite::minify(json)))
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSONString = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      self$`jsonData` <- Pet$new()$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+      self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      self
+    },
+
+    #' @description
+    #' Validate JSON input with respect to AddPetOptionalRequest and throw an exception if invalid
+    #'
+    #' @param input the JSON input
+    validateJSON = function(input) {
+      input_json <- jsonlite::fromJSON(input)
+    },
+
+    #' @description
+    #' To string (JSON format)
+    #'
+    #' @return String representation of AddPetOptionalRequest
+    toString = function() {
+      self$toJSONString()
+    },
+
+    #' @description
+    #' Return true if the values in all fields are valid.
+    #'
+    #' @return true if the values in all fields are valid.
+    isValid = function() {
+      TRUE
+    },
+
+    #' @description
+    #' Return a list of invalid fields (if any).
+    #'
+    #' @return A list of invalid fields (if any).
+    getInvalidFields = function() {
+      invalid_fields <- list()
+      invalid_fields
+    },
+
+    #' @description
+    #' Print the object
+    print = function() {
+      print(jsonlite::prettify(self$toJSONString()))
+      invisible(self)
+    }
+  ),
+  # Lock the class to prevent modifications to the method or field
+  lock_class = TRUE
+)
+## Uncomment below to unlock the class to allow modifications of the method or field
+# AddPetOptionalRequest$unlock()
+#
+## Below is an example to define the print function
+# AddPetOptionalRequest$set("public", "print", function(...) {
+#   print(jsonlite::prettify(self$toJSONString()))
+#   invisible(self)
+# })
+## Uncomment below to lock the class to prevent modifications to the method or field
+# AddPetOptionalRequest$lock()
+
diff --git a/samples/client/petstore/R-httr2/README.md b/samples/client/petstore/R-httr2/README.md
index dc317bf4f0f9..4df55194aaf1 100644
--- a/samples/client/petstore/R-httr2/README.md
+++ b/samples/client/petstore/R-httr2/README.md
@@ -104,6 +104,7 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AddPetOptionalRequest](docs/AddPetOptionalRequest.md)
  - [AllofTagApiResponse](docs/AllofTagApiResponse.md)
  - [Animal](docs/Animal.md)
  - [AnyOfPig](docs/AnyOfPig.md)
diff --git a/samples/client/petstore/R-httr2/docs/AddPetOptionalRequest.md b/samples/client/petstore/R-httr2/docs/AddPetOptionalRequest.md
new file mode 100644
index 000000000000..5a42fb097855
--- /dev/null
+++ b/samples/client/petstore/R-httr2/docs/AddPetOptionalRequest.md
@@ -0,0 +1,10 @@
+# petstore::AddPetOptionalRequest
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**jsonData** | [**Pet**](Pet.md) |  | [optional] 
+**binaryDataN2Information** | **data.frame** |  | [optional] 
+
+
diff --git a/samples/client/petstore/R-httr2/tests/testthat/test_add_pet_optional_request.R b/samples/client/petstore/R-httr2/tests/testthat/test_add_pet_optional_request.R
new file mode 100644
index 000000000000..86ca36b17353
--- /dev/null
+++ b/samples/client/petstore/R-httr2/tests/testthat/test_add_pet_optional_request.R
@@ -0,0 +1,20 @@
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+
+context("Test AddPetOptionalRequest")
+
+model_instance <- AddPetOptionalRequest$new()
+
+test_that("jsonData", {
+  # tests for the property `jsonData` (Pet)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`jsonData`, "EXPECTED_RESULT")
+})
+
+test_that("binaryDataN2Information", {
+  # tests for the property `binaryDataN2Information` (data.frame)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`binaryDataN2Information`, "EXPECTED_RESULT")
+})
diff --git a/samples/client/petstore/R/.openapi-generator/FILES b/samples/client/petstore/R/.openapi-generator/FILES
index 43681d7ddb2c..9c941b80d58b 100644
--- a/samples/client/petstore/R/.openapi-generator/FILES
+++ b/samples/client/petstore/R/.openapi-generator/FILES
@@ -5,6 +5,7 @@
 .travis.yml
 DESCRIPTION
 NAMESPACE
+R/add_pet_optional_request.R
 R/allof_tag_api_response.R
 R/animal.R
 R/any_of_pig.R
@@ -39,6 +40,7 @@ R/user_api.R
 R/whale.R
 R/zebra.R
 README.md
+docs/AddPetOptionalRequest.md
 docs/AllofTagApiResponse.md
 docs/Animal.md
 docs/AnyOfPig.md
@@ -71,3 +73,4 @@ docs/Whale.md
 docs/Zebra.md
 git_push.sh
 tests/testthat.R
+tests/testthat/test_add_pet_optional_request.R
diff --git a/samples/client/petstore/R/NAMESPACE b/samples/client/petstore/R/NAMESPACE
index 0b48a9205360..0ada504d992c 100644
--- a/samples/client/petstore/R/NAMESPACE
+++ b/samples/client/petstore/R/NAMESPACE
@@ -14,6 +14,7 @@ export(ApiResponse)
 export(ApiException)
 
 # Models
+export(AddPetOptionalRequest)
 export(AllofTagApiResponse)
 export(Animal)
 export(AnyOfPig)
diff --git a/samples/client/petstore/R/R/add_pet_optional_request.R b/samples/client/petstore/R/R/add_pet_optional_request.R
new file mode 100644
index 000000000000..948795ab180d
--- /dev/null
+++ b/samples/client/petstore/R/R/add_pet_optional_request.R
@@ -0,0 +1,227 @@
+#' Create a new AddPetOptionalRequest
+#'
+#' @description
+#' AddPetOptionalRequest Class
+#'
+#' @docType class
+#' @title AddPetOptionalRequest
+#' @description AddPetOptionalRequest Class
+#' @format An \code{R6Class} generator object
+#' @field jsonData  \link{Pet} [optional]
+#' @field binaryDataN2Information  data.frame [optional]
+#' @field _field_list a list of fields list(character)
+#' @field additional_properties additional properties list(character) [optional]
+#' @importFrom R6 R6Class
+#' @importFrom jsonlite fromJSON toJSON
+#' @export
+AddPetOptionalRequest <- R6::R6Class(
+  "AddPetOptionalRequest",
+  public = list(
+    `jsonData` = NULL,
+    `binaryDataN2Information` = NULL,
+    `_field_list` = c("jsonData", "binaryDataN2Information"),
+    `additional_properties` = list(),
+
+    #' @description
+    #' Initialize a new AddPetOptionalRequest class.
+    #'
+    #' @param jsonData jsonData
+    #' @param binaryDataN2Information binaryDataN2Information
+    #' @param additional_properties additional properties (optional)
+    #' @param ... Other optional arguments.
+    initialize = function(`jsonData` = NULL, `binaryDataN2Information` = NULL, additional_properties = NULL, ...) {
+      if (!is.null(`jsonData`)) {
+        stopifnot(R6::is.R6(`jsonData`))
+        self$`jsonData` <- `jsonData`
+      }
+      if (!is.null(`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- `binaryDataN2Information`
+      }
+      if (!is.null(additional_properties)) {
+        for (key in names(additional_properties)) {
+          self$additional_properties[[key]] <- additional_properties[[key]]
+        }
+      }
+    },
+
+    #' @description
+    #' Convert to an R object. This method is deprecated. Use `toSimpleType()` instead.
+    toJSON = function() {
+      .Deprecated(new = "toSimpleType", msg = "Use the '$toSimpleType()' method instead since that is more clearly named. Use '$toJSONString()' to get a JSON string")
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert to a List
+    #'
+    #' Convert the R6 object to a list to work more easily with other tooling.
+    #'
+    #' @return AddPetOptionalRequest as a base R list.
+    #' @examples
+    #' # convert array of AddPetOptionalRequest (x) to a data frame
+    #' \dontrun{
+    #' library(purrr)
+    #' library(tibble)
+    #' df <- x |> map(\(y)y$toList()) |> map(as_tibble) |> list_rbind()
+    #' df
+    #' }
+    toList = function() {
+      return(self$toSimpleType())
+    },
+
+    #' @description
+    #' Convert AddPetOptionalRequest to a base R type
+    #'
+    #' @return A base R type, e.g. a list or numeric/character array.
+    toSimpleType = function() {
+      AddPetOptionalRequestObject <- list()
+      if (!is.null(self$`jsonData`)) {
+        AddPetOptionalRequestObject[["jsonData"]] <-
+          self$extractSimpleType(self$`jsonData`)
+      }
+      if (!is.null(self$`binaryDataN2Information`)) {
+        AddPetOptionalRequestObject[["binaryDataN2Information"]] <-
+          self$`binaryDataN2Information`
+      }
+      for (key in names(self$additional_properties)) {
+        AddPetOptionalRequestObject[[key]] <- self$additional_properties[[key]]
+      }
+
+      return(AddPetOptionalRequestObject)
+    },
+
+    extractSimpleType = function(x) {
+      if (R6::is.R6(x)) {
+        return(x$toSimpleType())
+      } else if (!self$hasNestedR6(x)) {
+        return(x)
+      }
+      lapply(x, self$extractSimpleType)
+    },
+
+    hasNestedR6 = function(x) {
+      if (R6::is.R6(x)) {
+        return(TRUE)
+      }
+      if (is.list(x)) {
+        for (item in x) {
+          if (self$hasNestedR6(item)) {
+            return(TRUE)
+          }
+        }
+      }
+      FALSE
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSON = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      if (!is.null(this_object$`jsonData`)) {
+        `jsondata_object` <- Pet$new()
+        `jsondata_object`$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+        self$`jsonData` <- `jsondata_object`
+      }
+      if (!is.null(this_object$`binaryDataN2Information`)) {
+        self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      }
+      # process additional properties/fields in the payload
+      for (key in names(this_object)) {
+        if (!(key %in% self$`_field_list`)) { # json key not in list of fields
+          self$additional_properties[[key]] <- this_object[[key]]
+        }
+      }
+
+      self
+    },
+
+    #' @description
+    #' To JSON String
+    #' 
+    #' @param ... Parameters passed to `jsonlite::toJSON`
+    #' @return AddPetOptionalRequest in JSON format
+    toJSONString = function(...) {
+      simple <- self$toSimpleType()
+      for (key in names(self$additional_properties)) {
+        simple[[key]] <- self$additional_properties[[key]]
+      }
+      json <- jsonlite::toJSON(simple, auto_unbox = TRUE, digits = NA, ...)
+      return(as.character(jsonlite::minify(json)))
+    },
+
+    #' @description
+    #' Deserialize JSON string into an instance of AddPetOptionalRequest
+    #'
+    #' @param input_json the JSON input
+    #' @return the instance of AddPetOptionalRequest
+    fromJSONString = function(input_json) {
+      this_object <- jsonlite::fromJSON(input_json)
+      self$`jsonData` <- Pet$new()$fromJSON(jsonlite::toJSON(this_object$`jsonData`, auto_unbox = TRUE, digits = NA))
+      self$`binaryDataN2Information` <- this_object$`binaryDataN2Information`
+      # process additional properties/fields in the payload
+      for (key in names(this_object)) {
+        if (!(key %in% self$`_field_list`)) { # json key not in list of fields
+          self$additional_properties[[key]] <- this_object[[key]]
+        }
+      }
+
+      self
+    },
+
+    #' @description
+    #' Validate JSON input with respect to AddPetOptionalRequest and throw an exception if invalid
+    #'
+    #' @param input the JSON input
+    validateJSON = function(input) {
+      input_json <- jsonlite::fromJSON(input)
+    },
+
+    #' @description
+    #' To string (JSON format)
+    #'
+    #' @return String representation of AddPetOptionalRequest
+    toString = function() {
+      self$toJSONString()
+    },
+
+    #' @description
+    #' Return true if the values in all fields are valid.
+    #'
+    #' @return true if the values in all fields are valid.
+    isValid = function() {
+      TRUE
+    },
+
+    #' @description
+    #' Return a list of invalid fields (if any).
+    #'
+    #' @return A list of invalid fields (if any).
+    getInvalidFields = function() {
+      invalid_fields <- list()
+      invalid_fields
+    },
+
+    #' @description
+    #' Print the object
+    print = function() {
+      print(jsonlite::prettify(self$toJSONString()))
+      invisible(self)
+    }
+  ),
+  # Lock the class to prevent modifications to the method or field
+  lock_class = TRUE
+)
+## Uncomment below to unlock the class to allow modifications of the method or field
+# AddPetOptionalRequest$unlock()
+#
+## Below is an example to define the print function
+# AddPetOptionalRequest$set("public", "print", function(...) {
+#   print(jsonlite::prettify(self$toJSONString()))
+#   invisible(self)
+# })
+## Uncomment below to lock the class to prevent modifications to the method or field
+# AddPetOptionalRequest$lock()
+
diff --git a/samples/client/petstore/R/README.md b/samples/client/petstore/R/README.md
index 5715e73b1663..57c86636a1e7 100644
--- a/samples/client/petstore/R/README.md
+++ b/samples/client/petstore/R/README.md
@@ -104,6 +104,7 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AddPetOptionalRequest](docs/AddPetOptionalRequest.md)
  - [AllofTagApiResponse](docs/AllofTagApiResponse.md)
  - [Animal](docs/Animal.md)
  - [AnyOfPig](docs/AnyOfPig.md)
diff --git a/samples/client/petstore/R/docs/AddPetOptionalRequest.md b/samples/client/petstore/R/docs/AddPetOptionalRequest.md
new file mode 100644
index 000000000000..5a42fb097855
--- /dev/null
+++ b/samples/client/petstore/R/docs/AddPetOptionalRequest.md
@@ -0,0 +1,10 @@
+# petstore::AddPetOptionalRequest
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**jsonData** | [**Pet**](Pet.md) |  | [optional] 
+**binaryDataN2Information** | **data.frame** |  | [optional] 
+
+
diff --git a/samples/client/petstore/R/tests/testthat/test_add_pet_optional_request.R b/samples/client/petstore/R/tests/testthat/test_add_pet_optional_request.R
new file mode 100644
index 000000000000..86ca36b17353
--- /dev/null
+++ b/samples/client/petstore/R/tests/testthat/test_add_pet_optional_request.R
@@ -0,0 +1,20 @@
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+
+context("Test AddPetOptionalRequest")
+
+model_instance <- AddPetOptionalRequest$new()
+
+test_that("jsonData", {
+  # tests for the property `jsonData` (Pet)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`jsonData`, "EXPECTED_RESULT")
+})
+
+test_that("binaryDataN2Information", {
+  # tests for the property `binaryDataN2Information` (data.frame)
+
+  # uncomment below to test the property
+  #expect_equal(model.instance$`binaryDataN2Information`, "EXPECTED_RESULT")
+})
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
index cacee1eafc1b..4d4d8890e63a 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
@@ -47,7 +47,9 @@ docs/models/EnumClass.md
 docs/models/EnumTest.md
 docs/models/EnumTestEnumInteger.md
 docs/models/EnumTestEnumIntegerOnly.md
+docs/models/EnumTestEnumNumber.md
 docs/models/EnumTestEnumString.md
+docs/models/EnumTestEnumStringRequired.md
 docs/models/EquilateralTriangle.md
 docs/models/File.md
 docs/models/FileSchemaTestClass.md
@@ -100,6 +102,12 @@ docs/models/Quadrilateral.md
 docs/models/QuadrilateralInterface.md
 docs/models/ReadOnlyFirst.md
 docs/models/RequiredClass.md
+docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNotnullableEnumString.md
+docs/models/RequiredClassNotrequiredNullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNullableEnumString.md
 docs/models/RequiredClassRequiredNotnullableEnumInteger.md
 docs/models/RequiredClassRequiredNotnullableEnumIntegerOnly.md
 docs/models/RequiredClassRequiredNotnullableEnumString.md
@@ -121,8 +129,12 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
+docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
+docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumQueryStringParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
@@ -140,6 +152,18 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md
 docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -215,7 +239,9 @@ src/Org.OpenAPITools/Model/EnumClass.cs
 src/Org.OpenAPITools/Model/EnumTest.cs
 src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs
 src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 src/Org.OpenAPITools/Model/EnumTestEnumString.cs
+src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 src/Org.OpenAPITools/Model/EquilateralTriangle.cs
 src/Org.OpenAPITools/Model/File.cs
 src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -268,6 +294,12 @@ src/Org.OpenAPITools/Model/Quadrilateral.cs
 src/Org.OpenAPITools/Model/QuadrilateralInterface.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/RequiredClass.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs
@@ -289,8 +321,12 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
index 8e6e916f99eb..7b23eafe7ee8 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
@@ -763,7 +763,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -781,7 +781,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -1758,13 +1758,13 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_integer_only:
           $ref: "#/components/schemas/Enum_Test_enum_integer_only"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -2122,25 +2122,25 @@ components:
         required_notnullable_enum_integer:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
         notrequired_nullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer"
         notrequired_notnullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer"
         required_nullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
         required_notnullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
         notrequired_nullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer_only"
         notrequired_notnullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer_only"
         required_notnullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
         required_nullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
         notrequired_nullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_string"
         notrequired_notnullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_string"
         required_nullable_outerEnumDefaultValue:
           allOf:
           - $ref: "#/components/schemas/OuterEnumDefaultValue"
@@ -2819,6 +2819,32 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -2977,6 +3003,19 @@ components:
         value
       - "Duplicate\r\nvalue"
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
@@ -2988,6 +3027,12 @@ components:
       - 2
       - -2
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_of_enum_string_value:
       enum:
       - UPPER
@@ -3017,6 +3062,20 @@ components:
       format: int32
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: false
+      type: integer
     RequiredClass_required_nullable_enum_integer_only:
       enum:
       - 2
@@ -3029,6 +3088,18 @@ components:
       - -2
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: false
+      type: integer
     RequiredClass_required_notnullable_enum_string:
       enum:
       - UPPER
@@ -3057,6 +3128,34 @@ components:
       - "Duplicate\r\nvalue"
       nullable: true
       type: string
+    RequiredClass_notrequired_nullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: true
+      type: string
+    RequiredClass_notrequired_notnullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: false
+      type: string
     zebra_type:
       enum:
       - plains
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
index abf12b49fbf0..c9d830501c3d 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersEnumHeaderStringArrayParameterInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryStringParameter enumQueryString = null, List<TestEnumParametersEnumQueryStringArrayParameterInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,12 +496,12 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
-| **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderStringArray** | [**List&lt;TestEnumParametersEnumHeaderStringArrayParameterInner&gt;**](TestEnumParametersEnumHeaderStringArrayParameterInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
+| **enumQueryString** | **TestEnumParametersEnumQueryStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersEnumQueryStringArrayParameterInner&gt;**](TestEnumParametersEnumQueryStringArrayParameterInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTest.md
index 898c1ea1fb69..d95c14ac3f1f 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **EnumTestEnumString** |  | 
+**EnumStringRequired** | **EnumTestEnumStringRequired** |  | 
 **EnumInteger** | **EnumTestEnumInteger** |  | [optional] 
 **EnumIntegerOnly** | **EnumTestEnumIntegerOnly** |  | [optional] 
-**EnumNumber** | **TestEnumParametersEnumQueryDoubleParameter** |  | [optional] 
+**EnumNumber** | **EnumTestEnumNumber** |  | [optional] 
 **EnumString** | **EnumTestEnumString** |  | [optional] 
 **OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumNumber.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..2a2cd4d7d639
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumStringRequired.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..ca87d4b399f9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumStringRequired
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClass.md
index 2c792f6b2197..83eb241e197d 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClass.md
@@ -22,18 +22,18 @@ Name | Type | Description | Notes
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNotnullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNotnullableEnumInteger** | **RequiredClassRequiredNotnullableEnumInteger** |  | [optional] 
-**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassRequiredNotnullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNotnullableEnumString** | **RequiredClassRequiredNotnullableEnumString** |  | [optional] 
+**NotrequiredNotnullableEnumInteger** | **RequiredClassNotrequiredNotnullableEnumInteger** |  | [optional] 
+**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassNotrequiredNotnullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNotnullableEnumString** | **RequiredClassNotrequiredNotnullableEnumString** |  | [optional] 
 **NotrequiredNotnullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNotnullableStringProp** | **string** |  | [optional] 
 **NotrequiredNotnullableUuid** | **Guid** |  | [optional] 
 **NotrequiredNullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNullableEnumInteger** | **RequiredClassRequiredNullableEnumInteger** |  | [optional] 
-**NotrequiredNullableEnumIntegerOnly** | **RequiredClassRequiredNullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNullableEnumString** | **RequiredClassRequiredNullableEnumString** |  | [optional] 
+**NotrequiredNullableEnumInteger** | **RequiredClassNotrequiredNullableEnumInteger** |  | [optional] 
+**NotrequiredNullableEnumIntegerOnly** | **RequiredClassNotrequiredNullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNullableEnumString** | **RequiredClassNotrequiredNullableEnumString** |  | [optional] 
 **NotrequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNullableStringProp** | **string** |  | [optional] 
 **NotrequiredNullableUuid** | **Guid** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
new file mode 100644
index 000000000000..54873b1a91c9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0e04532adc7f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
new file mode 100644
index 000000000000..63d7c1cc12a5
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
new file mode 100644
index 000000000000..66ff81394f9f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0d27d688a88a
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
new file mode 100644
index 000000000000..1f98f53b8d73
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
new file mode 100644
index 000000000000..237e2a46d9c8
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..b5768f76fa5c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..d8ea29aecc57
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..49b8d9b71972
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
new file mode 100644
index 000000000000..a17804224bf6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumNumberTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumNumber
+        //private EnumTestEnumNumber instance;
+
+        public EnumTestEnumNumberTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumNumber
+            //instance = new EnumTestEnumNumber();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumNumber
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumNumber
+            //Assert.IsType<EnumTestEnumNumber>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
new file mode 100644
index 000000000000..d8772eebc7a0
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumStringRequired
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumStringRequiredTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumStringRequired
+        //private EnumTestEnumStringRequired instance;
+
+        public EnumTestEnumStringRequiredTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumStringRequired
+            //instance = new EnumTestEnumStringRequired();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumStringRequired
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumStringRequiredInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumStringRequired
+            //Assert.IsType<EnumTestEnumStringRequired>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..1a8374174269
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNotnullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNotnullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..1d5cfc6361c7
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumInteger
+        //private RequiredClassNotrequiredNotnullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumInteger
+            //instance = new RequiredClassNotrequiredNotnullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
new file mode 100644
index 000000000000..daee0a9ac47f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumString
+        //private RequiredClassNotrequiredNotnullableEnumString instance;
+
+        public RequiredClassNotrequiredNotnullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumString
+            //instance = new RequiredClassNotrequiredNotnullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..f3f14fcc5be9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..40a592e8a6bd
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumInteger
+        //private RequiredClassNotrequiredNullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumInteger
+            //instance = new RequiredClassNotrequiredNullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
new file mode 100644
index 000000000000..a6365769b618
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumString
+        //private RequiredClassNotrequiredNullableEnumString instance;
+
+        public RequiredClassNotrequiredNullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumString
+            //instance = new RequiredClassNotrequiredNullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..e85eeb06c47c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringArrayParameterInner
+        //private TestEnumParametersEnumHeaderStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumHeaderStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+            //instance = new TestEnumParametersEnumHeaderStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumHeaderStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
new file mode 100644
index 000000000000..13a2e1eb54fc
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringParameter
+        //private TestEnumParametersEnumHeaderStringParameter instance;
+
+        public TestEnumParametersEnumHeaderStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringParameter
+            //instance = new TestEnumParametersEnumHeaderStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringParameter
+            //Assert.IsType<TestEnumParametersEnumHeaderStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..aec190213b9e
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringArrayParameterInner
+        //private TestEnumParametersEnumQueryStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumQueryStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+            //instance = new TestEnumParametersEnumQueryStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumQueryStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
new file mode 100644
index 000000000000..6aa7849dfb33
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringParameter
+        //private TestEnumParametersEnumQueryStringParameter instance;
+
+        public TestEnumParametersEnumQueryStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringParameter
+            //instance = new TestEnumParametersEnumQueryStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringParameter
+            //Assert.IsType<TestEnumParametersEnumQueryStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 53ad97cbc3c1..b38628c9a5ca 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4459,7 +4459,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumFormStringArray));
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index df3b3537a120..c1c294f1b978 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -170,8 +170,12 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString();
             if (obj is EnumTestEnumIntegerOnly enumTestEnumIntegerOnly)
                 return EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString();
+            if (obj is EnumTestEnumNumber enumTestEnumNumber)
+                return EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString();
             if (obj is EnumTestEnumString enumTestEnumString)
                 return EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString);
+            if (obj is EnumTestEnumStringRequired enumTestEnumStringRequired)
+                return EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired);
             if (obj is FindPetsByStatusStatusParameterInner findPetsByStatusStatusParameterInner)
                 return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner);
             if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue)
@@ -190,6 +194,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return OuterEnumTestValueConverter.ToJsonValue(outerEnumTest);
             if (obj is PetStatus petStatus)
                 return PetStatusValueConverter.ToJsonValue(petStatus);
+            if (obj is RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger)
+                return RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString)
+                return RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString);
+            if (obj is RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger)
+                return RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString)
+                return RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString);
             if (obj is RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger)
                 return RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString();
             if (obj is RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly)
@@ -204,10 +220,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
+            if (obj is TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner)
+                return TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
+                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
                 return TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString();
+            if (obj is TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner)
+                return TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter)
+                return TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter);
             if (obj is TestEnumParametersRequestEnumFormString testEnumParametersRequestEnumFormString)
                 return TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString);
             if (obj is TestEnumParametersRequestEnumFormStringArrayInner testEnumParametersRequestEnumFormStringArrayInner)
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 86e57f6fc333..a505c30de262 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -85,8 +85,12 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredNullableJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
             _jsonOptions.Converters.Add(new FileSchemaTestClassJsonConverter());
@@ -148,6 +152,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new QuadrilateralInterfaceJsonConverter());
             _jsonOptions.Converters.Add(new ReadOnlyFirstJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter());
@@ -176,10 +192,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringArrayInnerJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
index 2de2f5e8414e..c827324ac511 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -42,7 +42,7 @@ public partial class EnumTest : IValidatableObject
         /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
         [JsonConstructor]
-        public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
+        public EnumTest(EnumTestEnumStringRequired enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<EnumTestEnumNumber?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
         {
             EnumStringRequired = enumStringRequired;
             EnumIntegerOption = enumInteger;
@@ -62,7 +62,7 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// Gets or Sets EnumStringRequired
         /// </summary>
         [JsonPropertyName("enum_string_required")]
-        public EnumTestEnumString EnumStringRequired { get; set; }
+        public EnumTestEnumStringRequired EnumStringRequired { get; set; }
 
         /// <summary>
         /// Used to track the state of EnumInteger
@@ -95,13 +95,13 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<TestEnumParametersEnumQueryDoubleParameter?> EnumNumberOption { get; private set; }
+        public Option<EnumTestEnumNumber?> EnumNumberOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets EnumNumber
         /// </summary>
         [JsonPropertyName("enum_number")]
-        public TestEnumParametersEnumQueryDoubleParameter? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
+        public EnumTestEnumNumber? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of EnumString
@@ -229,10 +229,10 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<EnumTestEnumString?> enumStringRequired = default;
+            Option<EnumTestEnumStringRequired?> enumStringRequired = default;
             Option<EnumTestEnumInteger?> enumInteger = default;
             Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default;
-            Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default;
+            Option<EnumTestEnumNumber?> enumNumber = default;
             Option<EnumTestEnumString?> enumString = default;
             Option<OuterEnum?> outerEnum = default;
             Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default;
@@ -257,7 +257,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_string_required":
                             string enumStringRequiredRawValue = utf8JsonReader.GetString();
                             if (enumStringRequiredRawValue != null)
-                                enumStringRequired = new Option<EnumTestEnumString?>(EnumTestEnumStringValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
+                                enumStringRequired = new Option<EnumTestEnumStringRequired?>(EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
                             break;
                         case "enum_integer":
                             string enumIntegerRawValue = utf8JsonReader.GetString();
@@ -272,7 +272,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_number":
                             string enumNumberRawValue = utf8JsonReader.GetString();
                             if (enumNumberRawValue != null)
-                                enumNumber = new Option<TestEnumParametersEnumQueryDoubleParameter?>(TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(enumNumberRawValue));
+                                enumNumber = new Option<EnumTestEnumNumber?>(EnumTestEnumNumberValueConverter.FromStringOrDefault(enumNumberRawValue));
                             break;
                         case "enum_string":
                             string enumStringRawValue = utf8JsonReader.GetString();
@@ -358,7 +358,7 @@ public override void Write(Utf8JsonWriter writer, EnumTest enumTest, JsonSeriali
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerializerOptions jsonSerializerOptions)
         {
-            var enumStringRequiredRawValue = EnumTestEnumStringValueConverter.ToJsonValue(enumTest.EnumStringRequired);
+            var enumStringRequiredRawValue = EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTest.EnumStringRequired);
             writer.WriteString("enum_string_required", enumStringRequiredRawValue);
 
             if (enumTest.EnumIntegerOption.IsSet)
@@ -373,7 +373,7 @@ public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerial
             }
             if (enumTest.EnumNumberOption.IsSet)
             {
-                var enumNumberRawValue = TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
+                var enumNumberRawValue = EnumTestEnumNumberValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
                 writer.WriteNumber("enum_number", enumNumberRawValue);
             }
             if (enumTest.EnumStringOption.IsSet)
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
new file mode 100644
index 000000000000..d2fe5cf7c218
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_number
+    /// </summary>
+    public enum EnumTestEnumNumber
+    {
+        /// <summary>
+        /// Enum NUMBER_1_DOT_1 for value: 1.1
+        /// </summary>
+        NUMBER_1_DOT_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+        /// </summary>
+        NUMBER_MINUS_1_DOT_2 = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumNumber"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumNumberValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber FromString(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumNumber: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber? FromStringOrDefault(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumNumber"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static double ToJsonValue(EnumTestEnumNumber value)
+        {
+            return (double) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumNumberJsonConverter : JsonConverter<EnumTestEnumNumber>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    public class EnumTestEnumNumberNullableJsonConverter : JsonConverter<EnumTestEnumNumber?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumNumber from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber? enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumNumber.HasValue ? EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
new file mode 100644
index 000000000000..399e522b7c0c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_string_required
+    /// </summary>
+    public enum EnumTestEnumStringRequired
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumStringRequired"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumStringRequiredValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumStringRequired: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumStringRequired"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(EnumTestEnumStringRequired value)
+        {
+            if (value == EnumTestEnumStringRequired.UPPER)
+                return "UPPER";
+
+            if (value == EnumTestEnumStringRequired.Lower)
+                return "lower";
+
+            if (value == EnumTestEnumStringRequired.Empty)
+                return "";
+
+            if (value == EnumTestEnumStringRequired.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == EnumTestEnumStringRequired.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == EnumTestEnumStringRequired.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumStringRequiredJsonConverter : JsonConverter<EnumTestEnumStringRequired>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    public class EnumTestEnumStringRequiredNullableJsonConverter : JsonConverter<EnumTestEnumStringRequired?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumStringRequired from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired? enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumStringRequired.HasValue ? EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
index ef0b4ec5b61c..f8085e0c93cb 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ public partial class RequiredClass : IValidatableObject
         /// <param name="requiredNullableStringProp">requiredNullableStringProp</param>
         /// <param name="requiredNullableUuid">requiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -157,39 +157,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer")]
-        public RequiredClassRequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer_only")]
-        public RequiredClassRequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_string")]
-        public RequiredClassRequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableOuterEnumDefaultValue
@@ -209,39 +209,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer")]
-        public RequiredClassRequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer_only")]
-        public RequiredClassRequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_string")]
-        public RequiredClassRequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableOuterEnumDefaultValue
@@ -704,18 +704,18 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
             Option<DateTime?> notrequiredNotnullableDatetimeProp = default;
-            Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
-            Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
+            Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNotnullableStringProp = default;
             Option<Guid?> notrequiredNotnullableUuid = default;
             Option<List<string>> notrequiredNullableArrayOfString = default;
             Option<bool?> notrequiredNullableBooleanProp = default;
             Option<DateTime?> notrequiredNullableDatetimeProp = default;
-            Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
-            Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default;
+            Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNullableStringProp = default;
             Option<Guid?> notrequiredNullableUuid = default;
@@ -811,17 +811,17 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                         case "notrequired_notnullable_enum_integer":
                             string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerRawValue != null)
-                                notrequiredNotnullableEnumInteger = new Option<RequiredClassRequiredNotnullableEnumInteger?>(RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
+                                notrequiredNotnullableEnumInteger = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
                             break;
                         case "notrequired_notnullable_enum_integer_only":
                             string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerOnlyRawValue != null)
-                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
+                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_notnullable_enum_string":
                             string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumStringRawValue != null)
-                                notrequiredNotnullableEnumString = new Option<RequiredClassRequiredNotnullableEnumString?>(RequiredClassRequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
+                                notrequiredNotnullableEnumString = new Option<RequiredClassNotrequiredNotnullableEnumString?>(RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
                             break;
                         case "notrequired_notnullable_outerEnumDefaultValue":
                             string notrequiredNotnullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -845,15 +845,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "notrequired_nullable_enum_integer":
                             string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumInteger = new Option<RequiredClassRequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
+                            notrequiredNullableEnumInteger = new Option<RequiredClassNotrequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
                             break;
                         case "notrequired_nullable_enum_integer_only":
                             string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
+                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_nullable_enum_string":
                             string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumString = new Option<RequiredClassRequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
+                            notrequiredNullableEnumString = new Option<RequiredClassNotrequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
                             break;
                         case "notrequired_nullable_outerEnumDefaultValue":
                             string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -1136,17 +1136,17 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
 
             if (requiredClass.NotrequiredNotnullableEnumIntegerOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
+                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer", notrequiredNotnullableEnumIntegerRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumIntegerOnlyOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
+                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer_only", notrequiredNotnullableEnumIntegerOnlyRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumStringOption.IsSet)
             {
-                var notrequiredNotnullableEnumStringRawValue = RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
+                var notrequiredNotnullableEnumStringRawValue = RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
                 writer.WriteString("notrequired_notnullable_enum_string", notrequiredNotnullableEnumStringRawValue);
             }
             if (requiredClass.NotrequiredNotnullableOuterEnumDefaultValueOption.IsSet)
@@ -1183,7 +1183,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerRawValue = RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
+                    var notrequiredNullableEnumIntegerRawValue = RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer", notrequiredNullableEnumIntegerRawValue);
                 }
                 else
@@ -1191,7 +1191,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
+                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer_only", notrequiredNullableEnumIntegerOnlyRawValue);
                 }
                 else
@@ -1199,7 +1199,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumStringOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumStringOption.Value != null)
                 {
-                    var notrequiredNullableEnumStringRawValue = RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
+                    var notrequiredNullableEnumStringRawValue = RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
                     writer.WriteString("notrequired_nullable_enum_string", notrequiredNullableEnumStringRawValue);
                 }
                 else
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
new file mode 100644
index 000000000000..03c6331d3658
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger? requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumInteger.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..c8e2c8d8619c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly? requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
new file mode 100644
index 000000000000..99c807384c10
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNotnullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNotnullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString? requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumString.HasValue ? RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
new file mode 100644
index 000000000000..73e23e577c36
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger? requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumInteger.HasValue ? RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..703154711431
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly? requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
new file mode 100644
index 000000000000..b20fd9668c26
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString? requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumString.HasValue ? RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
new file mode 100644
index 000000000000..19c0f7913257
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner? testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringArrayParameterInner.HasValue ? TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
new file mode 100644
index 000000000000..4fe8d2deb709
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringParameter value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
new file mode 100644
index 000000000000..8987ec0636e6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner? testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringArrayParameterInner.HasValue ? TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
new file mode 100644
index 000000000000..3adbbcc0c4c6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringParameter value)
+        {
+            if (value == TestEnumParametersEnumQueryStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter? testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringParameter.HasValue ? TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
index 905ec3b8592d..5623190f3173 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
@@ -47,7 +47,9 @@ docs/models/EnumClass.md
 docs/models/EnumTest.md
 docs/models/EnumTestEnumInteger.md
 docs/models/EnumTestEnumIntegerOnly.md
+docs/models/EnumTestEnumNumber.md
 docs/models/EnumTestEnumString.md
+docs/models/EnumTestEnumStringRequired.md
 docs/models/EquilateralTriangle.md
 docs/models/File.md
 docs/models/FileSchemaTestClass.md
@@ -100,6 +102,12 @@ docs/models/Quadrilateral.md
 docs/models/QuadrilateralInterface.md
 docs/models/ReadOnlyFirst.md
 docs/models/RequiredClass.md
+docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNotnullableEnumString.md
+docs/models/RequiredClassNotrequiredNullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNullableEnumString.md
 docs/models/RequiredClassRequiredNotnullableEnumInteger.md
 docs/models/RequiredClassRequiredNotnullableEnumIntegerOnly.md
 docs/models/RequiredClassRequiredNotnullableEnumString.md
@@ -121,8 +129,12 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
+docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
+docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumQueryStringParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
@@ -140,6 +152,18 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md
 docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -213,7 +237,9 @@ src/Org.OpenAPITools/Model/EnumClass.cs
 src/Org.OpenAPITools/Model/EnumTest.cs
 src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs
 src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 src/Org.OpenAPITools/Model/EnumTestEnumString.cs
+src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 src/Org.OpenAPITools/Model/EquilateralTriangle.cs
 src/Org.OpenAPITools/Model/File.cs
 src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -266,6 +292,12 @@ src/Org.OpenAPITools/Model/Quadrilateral.cs
 src/Org.OpenAPITools/Model/QuadrilateralInterface.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/RequiredClass.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs
@@ -287,8 +319,12 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
index 8e6e916f99eb..7b23eafe7ee8 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
@@ -763,7 +763,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -781,7 +781,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -1758,13 +1758,13 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_integer_only:
           $ref: "#/components/schemas/Enum_Test_enum_integer_only"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -2122,25 +2122,25 @@ components:
         required_notnullable_enum_integer:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
         notrequired_nullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer"
         notrequired_notnullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer"
         required_nullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
         required_notnullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
         notrequired_nullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer_only"
         notrequired_notnullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer_only"
         required_notnullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
         required_nullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
         notrequired_nullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_string"
         notrequired_notnullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_string"
         required_nullable_outerEnumDefaultValue:
           allOf:
           - $ref: "#/components/schemas/OuterEnumDefaultValue"
@@ -2819,6 +2819,32 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -2977,6 +3003,19 @@ components:
         value
       - "Duplicate\r\nvalue"
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
@@ -2988,6 +3027,12 @@ components:
       - 2
       - -2
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_of_enum_string_value:
       enum:
       - UPPER
@@ -3017,6 +3062,20 @@ components:
       format: int32
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: false
+      type: integer
     RequiredClass_required_nullable_enum_integer_only:
       enum:
       - 2
@@ -3029,6 +3088,18 @@ components:
       - -2
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: false
+      type: integer
     RequiredClass_required_notnullable_enum_string:
       enum:
       - UPPER
@@ -3057,6 +3128,34 @@ components:
       - "Duplicate\r\nvalue"
       nullable: true
       type: string
+    RequiredClass_notrequired_nullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: true
+      type: string
+    RequiredClass_notrequired_notnullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: false
+      type: string
     zebra_type:
       enum:
       - plains
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
index 1a41e359c74e..9bff9c4cf6c1 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersEnumHeaderStringArrayParameterInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryStringParameter enumQueryString = null, List<TestEnumParametersEnumQueryStringArrayParameterInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,12 +496,12 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
-| **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderStringArray** | [**List&lt;TestEnumParametersEnumHeaderStringArrayParameterInner&gt;**](TestEnumParametersEnumHeaderStringArrayParameterInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
+| **enumQueryString** | **TestEnumParametersEnumQueryStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersEnumQueryStringArrayParameterInner&gt;**](TestEnumParametersEnumQueryStringArrayParameterInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTest.md
index 898c1ea1fb69..d95c14ac3f1f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **EnumTestEnumString** |  | 
+**EnumStringRequired** | **EnumTestEnumStringRequired** |  | 
 **EnumInteger** | **EnumTestEnumInteger** |  | [optional] 
 **EnumIntegerOnly** | **EnumTestEnumIntegerOnly** |  | [optional] 
-**EnumNumber** | **TestEnumParametersEnumQueryDoubleParameter** |  | [optional] 
+**EnumNumber** | **EnumTestEnumNumber** |  | [optional] 
 **EnumString** | **EnumTestEnumString** |  | [optional] 
 **OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumNumber.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..2a2cd4d7d639
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumStringRequired.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..ca87d4b399f9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumStringRequired
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClass.md
index 11265eef841e..7f0268586fba 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClass.md
@@ -22,18 +22,18 @@ Name | Type | Description | Notes
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNotnullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNotnullableEnumInteger** | **RequiredClassRequiredNotnullableEnumInteger** |  | [optional] 
-**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassRequiredNotnullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNotnullableEnumString** | **RequiredClassRequiredNotnullableEnumString** |  | [optional] 
+**NotrequiredNotnullableEnumInteger** | **RequiredClassNotrequiredNotnullableEnumInteger** |  | [optional] 
+**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassNotrequiredNotnullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNotnullableEnumString** | **RequiredClassNotrequiredNotnullableEnumString** |  | [optional] 
 **NotrequiredNotnullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNotnullableStringProp** | **string** |  | [optional] 
 **NotrequiredNotnullableUuid** | **Guid** |  | [optional] 
 **NotrequiredNullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNullableEnumInteger** | **RequiredClassRequiredNullableEnumInteger** |  | [optional] 
-**NotrequiredNullableEnumIntegerOnly** | **RequiredClassRequiredNullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNullableEnumString** | **RequiredClassRequiredNullableEnumString** |  | [optional] 
+**NotrequiredNullableEnumInteger** | **RequiredClassNotrequiredNullableEnumInteger** |  | [optional] 
+**NotrequiredNullableEnumIntegerOnly** | **RequiredClassNotrequiredNullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNullableEnumString** | **RequiredClassNotrequiredNullableEnumString** |  | [optional] 
 **NotrequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNullableStringProp** | **string** |  | [optional] 
 **NotrequiredNullableUuid** | **Guid** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
new file mode 100644
index 000000000000..54873b1a91c9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0e04532adc7f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
new file mode 100644
index 000000000000..63d7c1cc12a5
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
new file mode 100644
index 000000000000..66ff81394f9f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0d27d688a88a
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
new file mode 100644
index 000000000000..1f98f53b8d73
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
new file mode 100644
index 000000000000..237e2a46d9c8
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..b5768f76fa5c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..d8ea29aecc57
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..49b8d9b71972
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
new file mode 100644
index 000000000000..a17804224bf6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumNumberTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumNumber
+        //private EnumTestEnumNumber instance;
+
+        public EnumTestEnumNumberTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumNumber
+            //instance = new EnumTestEnumNumber();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumNumber
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumNumber
+            //Assert.IsType<EnumTestEnumNumber>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
new file mode 100644
index 000000000000..d8772eebc7a0
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumStringRequired
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumStringRequiredTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumStringRequired
+        //private EnumTestEnumStringRequired instance;
+
+        public EnumTestEnumStringRequiredTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumStringRequired
+            //instance = new EnumTestEnumStringRequired();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumStringRequired
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumStringRequiredInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumStringRequired
+            //Assert.IsType<EnumTestEnumStringRequired>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..1a8374174269
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNotnullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNotnullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..1d5cfc6361c7
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumInteger
+        //private RequiredClassNotrequiredNotnullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumInteger
+            //instance = new RequiredClassNotrequiredNotnullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
new file mode 100644
index 000000000000..daee0a9ac47f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumString
+        //private RequiredClassNotrequiredNotnullableEnumString instance;
+
+        public RequiredClassNotrequiredNotnullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumString
+            //instance = new RequiredClassNotrequiredNotnullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..f3f14fcc5be9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..40a592e8a6bd
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumInteger
+        //private RequiredClassNotrequiredNullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumInteger
+            //instance = new RequiredClassNotrequiredNullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
new file mode 100644
index 000000000000..a6365769b618
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumString
+        //private RequiredClassNotrequiredNullableEnumString instance;
+
+        public RequiredClassNotrequiredNullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumString
+            //instance = new RequiredClassNotrequiredNullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..e85eeb06c47c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringArrayParameterInner
+        //private TestEnumParametersEnumHeaderStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumHeaderStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+            //instance = new TestEnumParametersEnumHeaderStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumHeaderStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
new file mode 100644
index 000000000000..13a2e1eb54fc
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringParameter
+        //private TestEnumParametersEnumHeaderStringParameter instance;
+
+        public TestEnumParametersEnumHeaderStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringParameter
+            //instance = new TestEnumParametersEnumHeaderStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringParameter
+            //Assert.IsType<TestEnumParametersEnumHeaderStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..aec190213b9e
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringArrayParameterInner
+        //private TestEnumParametersEnumQueryStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumQueryStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+            //instance = new TestEnumParametersEnumQueryStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumQueryStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
new file mode 100644
index 000000000000..6aa7849dfb33
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringParameter
+        //private TestEnumParametersEnumQueryStringParameter instance;
+
+        public TestEnumParametersEnumQueryStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringParameter
+            //instance = new TestEnumParametersEnumQueryStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringParameter
+            //Assert.IsType<TestEnumParametersEnumQueryStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 3f5b3258a5b3..05d2f35f891d 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumFormStringArray));
@@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4575,7 +4575,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index 69cca784e095..42c53d013029 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -171,8 +171,12 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString();
             if (obj is EnumTestEnumIntegerOnly enumTestEnumIntegerOnly)
                 return EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString();
+            if (obj is EnumTestEnumNumber enumTestEnumNumber)
+                return EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString();
             if (obj is EnumTestEnumString enumTestEnumString)
                 return EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString);
+            if (obj is EnumTestEnumStringRequired enumTestEnumStringRequired)
+                return EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired);
             if (obj is FindPetsByStatusStatusParameterInner findPetsByStatusStatusParameterInner)
                 return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner);
             if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue)
@@ -191,6 +195,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return OuterEnumTestValueConverter.ToJsonValue(outerEnumTest);
             if (obj is PetStatus petStatus)
                 return PetStatusValueConverter.ToJsonValue(petStatus);
+            if (obj is RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger)
+                return RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString)
+                return RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString);
+            if (obj is RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger)
+                return RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString)
+                return RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString);
             if (obj is RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger)
                 return RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString();
             if (obj is RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly)
@@ -205,10 +221,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
+            if (obj is TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner)
+                return TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
+                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
                 return TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString();
+            if (obj is TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner)
+                return TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter)
+                return TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter);
             if (obj is TestEnumParametersRequestEnumFormString testEnumParametersRequestEnumFormString)
                 return TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString);
             if (obj is TestEnumParametersRequestEnumFormStringArrayInner testEnumParametersRequestEnumFormStringArrayInner)
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 1f106876c427..52d64d5b53dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -83,8 +83,12 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredNullableJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
             _jsonOptions.Converters.Add(new FileSchemaTestClassJsonConverter());
@@ -146,6 +150,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new QuadrilateralInterfaceJsonConverter());
             _jsonOptions.Converters.Add(new ReadOnlyFirstJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter());
@@ -174,10 +190,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringArrayInnerJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
index 7de18e33bc27..f2b219403e4b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -42,7 +42,7 @@ public partial class EnumTest : IValidatableObject
         /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
         [JsonConstructor]
-        public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
+        public EnumTest(EnumTestEnumStringRequired enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<EnumTestEnumNumber?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
         {
             EnumStringRequired = enumStringRequired;
             EnumIntegerOption = enumInteger;
@@ -62,7 +62,7 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// Gets or Sets EnumStringRequired
         /// </summary>
         [JsonPropertyName("enum_string_required")]
-        public EnumTestEnumString EnumStringRequired { get; set; }
+        public EnumTestEnumStringRequired EnumStringRequired { get; set; }
 
         /// <summary>
         /// Used to track the state of EnumInteger
@@ -95,13 +95,13 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<TestEnumParametersEnumQueryDoubleParameter?> EnumNumberOption { get; private set; }
+        public Option<EnumTestEnumNumber?> EnumNumberOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets EnumNumber
         /// </summary>
         [JsonPropertyName("enum_number")]
-        public TestEnumParametersEnumQueryDoubleParameter? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new Option<TestEnumParametersEnumQueryDoubleParameter?>(value); } }
+        public EnumTestEnumNumber? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new Option<EnumTestEnumNumber?>(value); } }
 
         /// <summary>
         /// Used to track the state of EnumString
@@ -229,10 +229,10 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<EnumTestEnumString?> enumStringRequired = default;
+            Option<EnumTestEnumStringRequired?> enumStringRequired = default;
             Option<EnumTestEnumInteger?> enumInteger = default;
             Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default;
-            Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default;
+            Option<EnumTestEnumNumber?> enumNumber = default;
             Option<EnumTestEnumString?> enumString = default;
             Option<OuterEnum?> outerEnum = default;
             Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default;
@@ -257,7 +257,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_string_required":
                             string enumStringRequiredRawValue = utf8JsonReader.GetString();
                             if (enumStringRequiredRawValue != null)
-                                enumStringRequired = new Option<EnumTestEnumString?>(EnumTestEnumStringValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
+                                enumStringRequired = new Option<EnumTestEnumStringRequired?>(EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
                             break;
                         case "enum_integer":
                             string enumIntegerRawValue = utf8JsonReader.GetString();
@@ -272,7 +272,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_number":
                             string enumNumberRawValue = utf8JsonReader.GetString();
                             if (enumNumberRawValue != null)
-                                enumNumber = new Option<TestEnumParametersEnumQueryDoubleParameter?>(TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(enumNumberRawValue));
+                                enumNumber = new Option<EnumTestEnumNumber?>(EnumTestEnumNumberValueConverter.FromStringOrDefault(enumNumberRawValue));
                             break;
                         case "enum_string":
                             string enumStringRawValue = utf8JsonReader.GetString();
@@ -358,7 +358,7 @@ public override void Write(Utf8JsonWriter writer, EnumTest enumTest, JsonSeriali
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerializerOptions jsonSerializerOptions)
         {
-            var enumStringRequiredRawValue = EnumTestEnumStringValueConverter.ToJsonValue(enumTest.EnumStringRequired);
+            var enumStringRequiredRawValue = EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTest.EnumStringRequired);
             writer.WriteString("enum_string_required", enumStringRequiredRawValue);
 
             if (enumTest.EnumIntegerOption.IsSet)
@@ -373,7 +373,7 @@ public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerial
             }
             if (enumTest.EnumNumberOption.IsSet)
             {
-                var enumNumberRawValue = TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
+                var enumNumberRawValue = EnumTestEnumNumberValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
                 writer.WriteNumber("enum_number", enumNumberRawValue);
             }
             if (enumTest.EnumStringOption.IsSet)
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
new file mode 100644
index 000000000000..d2fe5cf7c218
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_number
+    /// </summary>
+    public enum EnumTestEnumNumber
+    {
+        /// <summary>
+        /// Enum NUMBER_1_DOT_1 for value: 1.1
+        /// </summary>
+        NUMBER_1_DOT_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+        /// </summary>
+        NUMBER_MINUS_1_DOT_2 = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumNumber"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumNumberValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber FromString(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumNumber: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber? FromStringOrDefault(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumNumber"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static double ToJsonValue(EnumTestEnumNumber value)
+        {
+            return (double) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumNumberJsonConverter : JsonConverter<EnumTestEnumNumber>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    public class EnumTestEnumNumberNullableJsonConverter : JsonConverter<EnumTestEnumNumber?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumNumber from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber? enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumNumber.HasValue ? EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
new file mode 100644
index 000000000000..399e522b7c0c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_string_required
+    /// </summary>
+    public enum EnumTestEnumStringRequired
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumStringRequired"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumStringRequiredValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumStringRequired: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumStringRequired"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(EnumTestEnumStringRequired value)
+        {
+            if (value == EnumTestEnumStringRequired.UPPER)
+                return "UPPER";
+
+            if (value == EnumTestEnumStringRequired.Lower)
+                return "lower";
+
+            if (value == EnumTestEnumStringRequired.Empty)
+                return "";
+
+            if (value == EnumTestEnumStringRequired.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == EnumTestEnumStringRequired.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == EnumTestEnumStringRequired.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumStringRequiredJsonConverter : JsonConverter<EnumTestEnumStringRequired>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    public class EnumTestEnumStringRequiredNullableJsonConverter : JsonConverter<EnumTestEnumStringRequired?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumStringRequired from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired? enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumStringRequired.HasValue ? EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
index 14484cb58e83..63ab271c0575 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ public partial class RequiredClass : IValidatableObject
         /// <param name="requiredNullableStringProp">requiredNullableStringProp</param>
         /// <param name="requiredNullableUuid">requiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
+        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -157,39 +157,39 @@ public RequiredClass(DateTime requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer")]
-        public RequiredClassRequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new Option<RequiredClassRequiredNotnullableEnumInteger?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer_only")]
-        public RequiredClassRequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_string")]
-        public RequiredClassRequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new Option<RequiredClassRequiredNotnullableEnumString?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new Option<RequiredClassNotrequiredNotnullableEnumString?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableOuterEnumDefaultValue
@@ -209,39 +209,39 @@ public RequiredClass(DateTime requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer")]
-        public RequiredClassRequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new Option<RequiredClassRequiredNullableEnumInteger?>(value); } }
+        public RequiredClassNotrequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new Option<RequiredClassNotrequiredNullableEnumInteger?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer_only")]
-        public RequiredClassRequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(value); } }
+        public RequiredClassNotrequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_string")]
-        public RequiredClassRequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new Option<RequiredClassRequiredNullableEnumString?>(value); } }
+        public RequiredClassNotrequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new Option<RequiredClassNotrequiredNullableEnumString?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableOuterEnumDefaultValue
@@ -704,18 +704,18 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
             Option<DateTime?> notrequiredNotnullableDatetimeProp = default;
-            Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
-            Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
+            Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNotnullableStringProp = default;
             Option<Guid?> notrequiredNotnullableUuid = default;
             Option<List<string>> notrequiredNullableArrayOfString = default;
             Option<bool?> notrequiredNullableBooleanProp = default;
             Option<DateTime?> notrequiredNullableDatetimeProp = default;
-            Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
-            Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default;
+            Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNullableStringProp = default;
             Option<Guid?> notrequiredNullableUuid = default;
@@ -811,17 +811,17 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                         case "notrequired_notnullable_enum_integer":
                             string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerRawValue != null)
-                                notrequiredNotnullableEnumInteger = new Option<RequiredClassRequiredNotnullableEnumInteger?>(RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
+                                notrequiredNotnullableEnumInteger = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
                             break;
                         case "notrequired_notnullable_enum_integer_only":
                             string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerOnlyRawValue != null)
-                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
+                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_notnullable_enum_string":
                             string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumStringRawValue != null)
-                                notrequiredNotnullableEnumString = new Option<RequiredClassRequiredNotnullableEnumString?>(RequiredClassRequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
+                                notrequiredNotnullableEnumString = new Option<RequiredClassNotrequiredNotnullableEnumString?>(RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
                             break;
                         case "notrequired_notnullable_outerEnumDefaultValue":
                             string notrequiredNotnullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -845,15 +845,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "notrequired_nullable_enum_integer":
                             string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumInteger = new Option<RequiredClassRequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
+                            notrequiredNullableEnumInteger = new Option<RequiredClassNotrequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
                             break;
                         case "notrequired_nullable_enum_integer_only":
                             string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
+                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_nullable_enum_string":
                             string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumString = new Option<RequiredClassRequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
+                            notrequiredNullableEnumString = new Option<RequiredClassNotrequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
                             break;
                         case "notrequired_nullable_outerEnumDefaultValue":
                             string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -1136,17 +1136,17 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
 
             if (requiredClass.NotrequiredNotnullableEnumIntegerOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
+                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer", notrequiredNotnullableEnumIntegerRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumIntegerOnlyOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
+                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer_only", notrequiredNotnullableEnumIntegerOnlyRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumStringOption.IsSet)
             {
-                var notrequiredNotnullableEnumStringRawValue = RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
+                var notrequiredNotnullableEnumStringRawValue = RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
                 writer.WriteString("notrequired_notnullable_enum_string", notrequiredNotnullableEnumStringRawValue);
             }
             if (requiredClass.NotrequiredNotnullableOuterEnumDefaultValueOption.IsSet)
@@ -1183,7 +1183,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerRawValue = RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
+                    var notrequiredNullableEnumIntegerRawValue = RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer", notrequiredNullableEnumIntegerRawValue);
                 }
                 else
@@ -1191,7 +1191,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
+                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer_only", notrequiredNullableEnumIntegerOnlyRawValue);
                 }
                 else
@@ -1199,7 +1199,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumStringOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumStringOption.Value != null)
                 {
-                    var notrequiredNullableEnumStringRawValue = RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
+                    var notrequiredNullableEnumStringRawValue = RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
                     writer.WriteString("notrequired_nullable_enum_string", notrequiredNullableEnumStringRawValue);
                 }
                 else
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
new file mode 100644
index 000000000000..03c6331d3658
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger? requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumInteger.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..c8e2c8d8619c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly? requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
new file mode 100644
index 000000000000..99c807384c10
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNotnullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNotnullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString? requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumString.HasValue ? RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
new file mode 100644
index 000000000000..73e23e577c36
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger? requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumInteger.HasValue ? RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..703154711431
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly? requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
new file mode 100644
index 000000000000..b20fd9668c26
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString? requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumString.HasValue ? RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
new file mode 100644
index 000000000000..19c0f7913257
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner? testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringArrayParameterInner.HasValue ? TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
new file mode 100644
index 000000000000..4fe8d2deb709
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringParameter value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
new file mode 100644
index 000000000000..8987ec0636e6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner? testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringArrayParameterInner.HasValue ? TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
new file mode 100644
index 000000000000..3adbbcc0c4c6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringParameter value)
+        {
+            if (value == TestEnumParametersEnumQueryStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter? testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringParameter.HasValue ? TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
index 905ec3b8592d..5623190f3173 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
@@ -47,7 +47,9 @@ docs/models/EnumClass.md
 docs/models/EnumTest.md
 docs/models/EnumTestEnumInteger.md
 docs/models/EnumTestEnumIntegerOnly.md
+docs/models/EnumTestEnumNumber.md
 docs/models/EnumTestEnumString.md
+docs/models/EnumTestEnumStringRequired.md
 docs/models/EquilateralTriangle.md
 docs/models/File.md
 docs/models/FileSchemaTestClass.md
@@ -100,6 +102,12 @@ docs/models/Quadrilateral.md
 docs/models/QuadrilateralInterface.md
 docs/models/ReadOnlyFirst.md
 docs/models/RequiredClass.md
+docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNotnullableEnumString.md
+docs/models/RequiredClassNotrequiredNullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNullableEnumString.md
 docs/models/RequiredClassRequiredNotnullableEnumInteger.md
 docs/models/RequiredClassRequiredNotnullableEnumIntegerOnly.md
 docs/models/RequiredClassRequiredNotnullableEnumString.md
@@ -121,8 +129,12 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
+docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
+docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumQueryStringParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
@@ -140,6 +152,18 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md
 docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -213,7 +237,9 @@ src/Org.OpenAPITools/Model/EnumClass.cs
 src/Org.OpenAPITools/Model/EnumTest.cs
 src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs
 src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 src/Org.OpenAPITools/Model/EnumTestEnumString.cs
+src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 src/Org.OpenAPITools/Model/EquilateralTriangle.cs
 src/Org.OpenAPITools/Model/File.cs
 src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -266,6 +292,12 @@ src/Org.OpenAPITools/Model/Quadrilateral.cs
 src/Org.OpenAPITools/Model/QuadrilateralInterface.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/RequiredClass.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs
@@ -287,8 +319,12 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
index 8e6e916f99eb..7b23eafe7ee8 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
@@ -763,7 +763,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -781,7 +781,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -1758,13 +1758,13 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_integer_only:
           $ref: "#/components/schemas/Enum_Test_enum_integer_only"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -2122,25 +2122,25 @@ components:
         required_notnullable_enum_integer:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
         notrequired_nullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer"
         notrequired_notnullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer"
         required_nullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
         required_notnullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
         notrequired_nullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer_only"
         notrequired_notnullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer_only"
         required_notnullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
         required_nullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
         notrequired_nullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_string"
         notrequired_notnullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_string"
         required_nullable_outerEnumDefaultValue:
           allOf:
           - $ref: "#/components/schemas/OuterEnumDefaultValue"
@@ -2819,6 +2819,32 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -2977,6 +3003,19 @@ components:
         value
       - "Duplicate\r\nvalue"
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
@@ -2988,6 +3027,12 @@ components:
       - 2
       - -2
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_of_enum_string_value:
       enum:
       - UPPER
@@ -3017,6 +3062,20 @@ components:
       format: int32
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: false
+      type: integer
     RequiredClass_required_nullable_enum_integer_only:
       enum:
       - 2
@@ -3029,6 +3088,18 @@ components:
       - -2
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: false
+      type: integer
     RequiredClass_required_notnullable_enum_string:
       enum:
       - UPPER
@@ -3057,6 +3128,34 @@ components:
       - "Duplicate\r\nvalue"
       nullable: true
       type: string
+    RequiredClass_notrequired_nullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: true
+      type: string
+    RequiredClass_notrequired_notnullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: false
+      type: string
     zebra_type:
       enum:
       - plains
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
index 1a41e359c74e..9bff9c4cf6c1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersEnumHeaderStringArrayParameterInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryStringParameter enumQueryString = null, List<TestEnumParametersEnumQueryStringArrayParameterInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,12 +496,12 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
-| **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderStringArray** | [**List&lt;TestEnumParametersEnumHeaderStringArrayParameterInner&gt;**](TestEnumParametersEnumHeaderStringArrayParameterInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
+| **enumQueryString** | **TestEnumParametersEnumQueryStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersEnumQueryStringArrayParameterInner&gt;**](TestEnumParametersEnumQueryStringArrayParameterInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTest.md
index 898c1ea1fb69..d95c14ac3f1f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **EnumTestEnumString** |  | 
+**EnumStringRequired** | **EnumTestEnumStringRequired** |  | 
 **EnumInteger** | **EnumTestEnumInteger** |  | [optional] 
 **EnumIntegerOnly** | **EnumTestEnumIntegerOnly** |  | [optional] 
-**EnumNumber** | **TestEnumParametersEnumQueryDoubleParameter** |  | [optional] 
+**EnumNumber** | **EnumTestEnumNumber** |  | [optional] 
 **EnumString** | **EnumTestEnumString** |  | [optional] 
 **OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumNumber.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..2a2cd4d7d639
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumStringRequired.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..ca87d4b399f9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumStringRequired
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClass.md
index 11265eef841e..7f0268586fba 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClass.md
@@ -22,18 +22,18 @@ Name | Type | Description | Notes
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNotnullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNotnullableEnumInteger** | **RequiredClassRequiredNotnullableEnumInteger** |  | [optional] 
-**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassRequiredNotnullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNotnullableEnumString** | **RequiredClassRequiredNotnullableEnumString** |  | [optional] 
+**NotrequiredNotnullableEnumInteger** | **RequiredClassNotrequiredNotnullableEnumInteger** |  | [optional] 
+**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassNotrequiredNotnullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNotnullableEnumString** | **RequiredClassNotrequiredNotnullableEnumString** |  | [optional] 
 **NotrequiredNotnullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNotnullableStringProp** | **string** |  | [optional] 
 **NotrequiredNotnullableUuid** | **Guid** |  | [optional] 
 **NotrequiredNullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNullableEnumInteger** | **RequiredClassRequiredNullableEnumInteger** |  | [optional] 
-**NotrequiredNullableEnumIntegerOnly** | **RequiredClassRequiredNullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNullableEnumString** | **RequiredClassRequiredNullableEnumString** |  | [optional] 
+**NotrequiredNullableEnumInteger** | **RequiredClassNotrequiredNullableEnumInteger** |  | [optional] 
+**NotrequiredNullableEnumIntegerOnly** | **RequiredClassNotrequiredNullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNullableEnumString** | **RequiredClassNotrequiredNullableEnumString** |  | [optional] 
 **NotrequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNullableStringProp** | **string** |  | [optional] 
 **NotrequiredNullableUuid** | **Guid** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
new file mode 100644
index 000000000000..54873b1a91c9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0e04532adc7f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
new file mode 100644
index 000000000000..63d7c1cc12a5
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
new file mode 100644
index 000000000000..66ff81394f9f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0d27d688a88a
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
new file mode 100644
index 000000000000..1f98f53b8d73
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
new file mode 100644
index 000000000000..237e2a46d9c8
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..b5768f76fa5c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..d8ea29aecc57
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..49b8d9b71972
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
new file mode 100644
index 000000000000..a17804224bf6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumNumberTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumNumber
+        //private EnumTestEnumNumber instance;
+
+        public EnumTestEnumNumberTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumNumber
+            //instance = new EnumTestEnumNumber();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumNumber
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumNumber
+            //Assert.IsType<EnumTestEnumNumber>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
new file mode 100644
index 000000000000..d8772eebc7a0
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumStringRequired
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumStringRequiredTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumStringRequired
+        //private EnumTestEnumStringRequired instance;
+
+        public EnumTestEnumStringRequiredTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumStringRequired
+            //instance = new EnumTestEnumStringRequired();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumStringRequired
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumStringRequiredInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumStringRequired
+            //Assert.IsType<EnumTestEnumStringRequired>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..1a8374174269
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNotnullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNotnullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..1d5cfc6361c7
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumInteger
+        //private RequiredClassNotrequiredNotnullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumInteger
+            //instance = new RequiredClassNotrequiredNotnullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
new file mode 100644
index 000000000000..daee0a9ac47f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumString
+        //private RequiredClassNotrequiredNotnullableEnumString instance;
+
+        public RequiredClassNotrequiredNotnullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumString
+            //instance = new RequiredClassNotrequiredNotnullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..f3f14fcc5be9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..40a592e8a6bd
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumInteger
+        //private RequiredClassNotrequiredNullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumInteger
+            //instance = new RequiredClassNotrequiredNullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
new file mode 100644
index 000000000000..a6365769b618
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumString
+        //private RequiredClassNotrequiredNullableEnumString instance;
+
+        public RequiredClassNotrequiredNullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumString
+            //instance = new RequiredClassNotrequiredNullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..e85eeb06c47c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringArrayParameterInner
+        //private TestEnumParametersEnumHeaderStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumHeaderStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+            //instance = new TestEnumParametersEnumHeaderStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumHeaderStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
new file mode 100644
index 000000000000..13a2e1eb54fc
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringParameter
+        //private TestEnumParametersEnumHeaderStringParameter instance;
+
+        public TestEnumParametersEnumHeaderStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringParameter
+            //instance = new TestEnumParametersEnumHeaderStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringParameter
+            //Assert.IsType<TestEnumParametersEnumHeaderStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..aec190213b9e
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringArrayParameterInner
+        //private TestEnumParametersEnumQueryStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumQueryStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+            //instance = new TestEnumParametersEnumQueryStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumQueryStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
new file mode 100644
index 000000000000..6aa7849dfb33
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringParameter
+        //private TestEnumParametersEnumQueryStringParameter instance;
+
+        public TestEnumParametersEnumQueryStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringParameter
+            //instance = new TestEnumParametersEnumQueryStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringParameter
+            //Assert.IsType<TestEnumParametersEnumQueryStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 3f5b3258a5b3..05d2f35f891d 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumFormStringArray));
@@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4575,7 +4575,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index 69cca784e095..42c53d013029 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -171,8 +171,12 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString();
             if (obj is EnumTestEnumIntegerOnly enumTestEnumIntegerOnly)
                 return EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString();
+            if (obj is EnumTestEnumNumber enumTestEnumNumber)
+                return EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString();
             if (obj is EnumTestEnumString enumTestEnumString)
                 return EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString);
+            if (obj is EnumTestEnumStringRequired enumTestEnumStringRequired)
+                return EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired);
             if (obj is FindPetsByStatusStatusParameterInner findPetsByStatusStatusParameterInner)
                 return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner);
             if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue)
@@ -191,6 +195,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return OuterEnumTestValueConverter.ToJsonValue(outerEnumTest);
             if (obj is PetStatus petStatus)
                 return PetStatusValueConverter.ToJsonValue(petStatus);
+            if (obj is RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger)
+                return RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString)
+                return RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString);
+            if (obj is RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger)
+                return RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString)
+                return RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString);
             if (obj is RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger)
                 return RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString();
             if (obj is RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly)
@@ -205,10 +221,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
+            if (obj is TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner)
+                return TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
+                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
                 return TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString();
+            if (obj is TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner)
+                return TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter)
+                return TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter);
             if (obj is TestEnumParametersRequestEnumFormString testEnumParametersRequestEnumFormString)
                 return TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString);
             if (obj is TestEnumParametersRequestEnumFormStringArrayInner testEnumParametersRequestEnumFormStringArrayInner)
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 1f106876c427..52d64d5b53dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -83,8 +83,12 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredNullableJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
             _jsonOptions.Converters.Add(new FileSchemaTestClassJsonConverter());
@@ -146,6 +150,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new QuadrilateralInterfaceJsonConverter());
             _jsonOptions.Converters.Add(new ReadOnlyFirstJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter());
@@ -174,10 +190,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringArrayInnerJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
index 7de18e33bc27..f2b219403e4b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -42,7 +42,7 @@ public partial class EnumTest : IValidatableObject
         /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
         [JsonConstructor]
-        public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
+        public EnumTest(EnumTestEnumStringRequired enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<EnumTestEnumNumber?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
         {
             EnumStringRequired = enumStringRequired;
             EnumIntegerOption = enumInteger;
@@ -62,7 +62,7 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// Gets or Sets EnumStringRequired
         /// </summary>
         [JsonPropertyName("enum_string_required")]
-        public EnumTestEnumString EnumStringRequired { get; set; }
+        public EnumTestEnumStringRequired EnumStringRequired { get; set; }
 
         /// <summary>
         /// Used to track the state of EnumInteger
@@ -95,13 +95,13 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<TestEnumParametersEnumQueryDoubleParameter?> EnumNumberOption { get; private set; }
+        public Option<EnumTestEnumNumber?> EnumNumberOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets EnumNumber
         /// </summary>
         [JsonPropertyName("enum_number")]
-        public TestEnumParametersEnumQueryDoubleParameter? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new Option<TestEnumParametersEnumQueryDoubleParameter?>(value); } }
+        public EnumTestEnumNumber? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new Option<EnumTestEnumNumber?>(value); } }
 
         /// <summary>
         /// Used to track the state of EnumString
@@ -229,10 +229,10 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<EnumTestEnumString?> enumStringRequired = default;
+            Option<EnumTestEnumStringRequired?> enumStringRequired = default;
             Option<EnumTestEnumInteger?> enumInteger = default;
             Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default;
-            Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default;
+            Option<EnumTestEnumNumber?> enumNumber = default;
             Option<EnumTestEnumString?> enumString = default;
             Option<OuterEnum?> outerEnum = default;
             Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default;
@@ -257,7 +257,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_string_required":
                             string enumStringRequiredRawValue = utf8JsonReader.GetString();
                             if (enumStringRequiredRawValue != null)
-                                enumStringRequired = new Option<EnumTestEnumString?>(EnumTestEnumStringValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
+                                enumStringRequired = new Option<EnumTestEnumStringRequired?>(EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
                             break;
                         case "enum_integer":
                             string enumIntegerRawValue = utf8JsonReader.GetString();
@@ -272,7 +272,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_number":
                             string enumNumberRawValue = utf8JsonReader.GetString();
                             if (enumNumberRawValue != null)
-                                enumNumber = new Option<TestEnumParametersEnumQueryDoubleParameter?>(TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(enumNumberRawValue));
+                                enumNumber = new Option<EnumTestEnumNumber?>(EnumTestEnumNumberValueConverter.FromStringOrDefault(enumNumberRawValue));
                             break;
                         case "enum_string":
                             string enumStringRawValue = utf8JsonReader.GetString();
@@ -358,7 +358,7 @@ public override void Write(Utf8JsonWriter writer, EnumTest enumTest, JsonSeriali
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerializerOptions jsonSerializerOptions)
         {
-            var enumStringRequiredRawValue = EnumTestEnumStringValueConverter.ToJsonValue(enumTest.EnumStringRequired);
+            var enumStringRequiredRawValue = EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTest.EnumStringRequired);
             writer.WriteString("enum_string_required", enumStringRequiredRawValue);
 
             if (enumTest.EnumIntegerOption.IsSet)
@@ -373,7 +373,7 @@ public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerial
             }
             if (enumTest.EnumNumberOption.IsSet)
             {
-                var enumNumberRawValue = TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
+                var enumNumberRawValue = EnumTestEnumNumberValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
                 writer.WriteNumber("enum_number", enumNumberRawValue);
             }
             if (enumTest.EnumStringOption.IsSet)
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
new file mode 100644
index 000000000000..d2fe5cf7c218
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_number
+    /// </summary>
+    public enum EnumTestEnumNumber
+    {
+        /// <summary>
+        /// Enum NUMBER_1_DOT_1 for value: 1.1
+        /// </summary>
+        NUMBER_1_DOT_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+        /// </summary>
+        NUMBER_MINUS_1_DOT_2 = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumNumber"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumNumberValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber FromString(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumNumber: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber? FromStringOrDefault(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumNumber"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static double ToJsonValue(EnumTestEnumNumber value)
+        {
+            return (double) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumNumberJsonConverter : JsonConverter<EnumTestEnumNumber>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    public class EnumTestEnumNumberNullableJsonConverter : JsonConverter<EnumTestEnumNumber?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumNumber from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber? enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumNumber.HasValue ? EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
new file mode 100644
index 000000000000..399e522b7c0c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_string_required
+    /// </summary>
+    public enum EnumTestEnumStringRequired
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumStringRequired"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumStringRequiredValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumStringRequired: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumStringRequired"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(EnumTestEnumStringRequired value)
+        {
+            if (value == EnumTestEnumStringRequired.UPPER)
+                return "UPPER";
+
+            if (value == EnumTestEnumStringRequired.Lower)
+                return "lower";
+
+            if (value == EnumTestEnumStringRequired.Empty)
+                return "";
+
+            if (value == EnumTestEnumStringRequired.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == EnumTestEnumStringRequired.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == EnumTestEnumStringRequired.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumStringRequiredJsonConverter : JsonConverter<EnumTestEnumStringRequired>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    public class EnumTestEnumStringRequiredNullableJsonConverter : JsonConverter<EnumTestEnumStringRequired?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumStringRequired from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired? enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumStringRequired.HasValue ? EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
index 14484cb58e83..63ab271c0575 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ public partial class RequiredClass : IValidatableObject
         /// <param name="requiredNullableStringProp">requiredNullableStringProp</param>
         /// <param name="requiredNullableUuid">requiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
+        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -157,39 +157,39 @@ public RequiredClass(DateTime requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer")]
-        public RequiredClassRequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new Option<RequiredClassRequiredNotnullableEnumInteger?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer_only")]
-        public RequiredClassRequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_string")]
-        public RequiredClassRequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new Option<RequiredClassRequiredNotnullableEnumString?>(value); } }
+        public RequiredClassNotrequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new Option<RequiredClassNotrequiredNotnullableEnumString?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableOuterEnumDefaultValue
@@ -209,39 +209,39 @@ public RequiredClass(DateTime requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer")]
-        public RequiredClassRequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new Option<RequiredClassRequiredNullableEnumInteger?>(value); } }
+        public RequiredClassNotrequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new Option<RequiredClassNotrequiredNullableEnumInteger?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer_only")]
-        public RequiredClassRequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(value); } }
+        public RequiredClassNotrequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_string")]
-        public RequiredClassRequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new Option<RequiredClassRequiredNullableEnumString?>(value); } }
+        public RequiredClassNotrequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new Option<RequiredClassNotrequiredNullableEnumString?>(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableOuterEnumDefaultValue
@@ -704,18 +704,18 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
             Option<DateTime?> notrequiredNotnullableDatetimeProp = default;
-            Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
-            Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
+            Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNotnullableStringProp = default;
             Option<Guid?> notrequiredNotnullableUuid = default;
             Option<List<string>> notrequiredNullableArrayOfString = default;
             Option<bool?> notrequiredNullableBooleanProp = default;
             Option<DateTime?> notrequiredNullableDatetimeProp = default;
-            Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
-            Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default;
+            Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNullableStringProp = default;
             Option<Guid?> notrequiredNullableUuid = default;
@@ -811,17 +811,17 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                         case "notrequired_notnullable_enum_integer":
                             string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerRawValue != null)
-                                notrequiredNotnullableEnumInteger = new Option<RequiredClassRequiredNotnullableEnumInteger?>(RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
+                                notrequiredNotnullableEnumInteger = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
                             break;
                         case "notrequired_notnullable_enum_integer_only":
                             string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerOnlyRawValue != null)
-                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
+                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_notnullable_enum_string":
                             string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumStringRawValue != null)
-                                notrequiredNotnullableEnumString = new Option<RequiredClassRequiredNotnullableEnumString?>(RequiredClassRequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
+                                notrequiredNotnullableEnumString = new Option<RequiredClassNotrequiredNotnullableEnumString?>(RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
                             break;
                         case "notrequired_notnullable_outerEnumDefaultValue":
                             string notrequiredNotnullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -845,15 +845,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "notrequired_nullable_enum_integer":
                             string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumInteger = new Option<RequiredClassRequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
+                            notrequiredNullableEnumInteger = new Option<RequiredClassNotrequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
                             break;
                         case "notrequired_nullable_enum_integer_only":
                             string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
+                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_nullable_enum_string":
                             string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumString = new Option<RequiredClassRequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
+                            notrequiredNullableEnumString = new Option<RequiredClassNotrequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
                             break;
                         case "notrequired_nullable_outerEnumDefaultValue":
                             string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -1136,17 +1136,17 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
 
             if (requiredClass.NotrequiredNotnullableEnumIntegerOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
+                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer", notrequiredNotnullableEnumIntegerRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumIntegerOnlyOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
+                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer_only", notrequiredNotnullableEnumIntegerOnlyRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumStringOption.IsSet)
             {
-                var notrequiredNotnullableEnumStringRawValue = RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
+                var notrequiredNotnullableEnumStringRawValue = RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
                 writer.WriteString("notrequired_notnullable_enum_string", notrequiredNotnullableEnumStringRawValue);
             }
             if (requiredClass.NotrequiredNotnullableOuterEnumDefaultValueOption.IsSet)
@@ -1183,7 +1183,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerRawValue = RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
+                    var notrequiredNullableEnumIntegerRawValue = RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer", notrequiredNullableEnumIntegerRawValue);
                 }
                 else
@@ -1191,7 +1191,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
+                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer_only", notrequiredNullableEnumIntegerOnlyRawValue);
                 }
                 else
@@ -1199,7 +1199,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumStringOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumStringOption.Value != null)
                 {
-                    var notrequiredNullableEnumStringRawValue = RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
+                    var notrequiredNullableEnumStringRawValue = RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
                     writer.WriteString("notrequired_nullable_enum_string", notrequiredNullableEnumStringRawValue);
                 }
                 else
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
new file mode 100644
index 000000000000..03c6331d3658
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger? requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumInteger.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..c8e2c8d8619c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly? requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
new file mode 100644
index 000000000000..99c807384c10
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNotnullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNotnullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString? requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumString.HasValue ? RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
new file mode 100644
index 000000000000..73e23e577c36
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger? requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumInteger.HasValue ? RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..703154711431
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly? requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
new file mode 100644
index 000000000000..b20fd9668c26
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString? requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumString.HasValue ? RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
new file mode 100644
index 000000000000..19c0f7913257
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner? testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringArrayParameterInner.HasValue ? TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
new file mode 100644
index 000000000000..4fe8d2deb709
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringParameter value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
new file mode 100644
index 000000000000..8987ec0636e6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner? testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringArrayParameterInner.HasValue ? TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
new file mode 100644
index 000000000000..3adbbcc0c4c6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringParameter value)
+        {
+            if (value == TestEnumParametersEnumQueryStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter? testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringParameter.HasValue ? TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
index cacee1eafc1b..4d4d8890e63a 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
@@ -47,7 +47,9 @@ docs/models/EnumClass.md
 docs/models/EnumTest.md
 docs/models/EnumTestEnumInteger.md
 docs/models/EnumTestEnumIntegerOnly.md
+docs/models/EnumTestEnumNumber.md
 docs/models/EnumTestEnumString.md
+docs/models/EnumTestEnumStringRequired.md
 docs/models/EquilateralTriangle.md
 docs/models/File.md
 docs/models/FileSchemaTestClass.md
@@ -100,6 +102,12 @@ docs/models/Quadrilateral.md
 docs/models/QuadrilateralInterface.md
 docs/models/ReadOnlyFirst.md
 docs/models/RequiredClass.md
+docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNotnullableEnumString.md
+docs/models/RequiredClassNotrequiredNullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNullableEnumString.md
 docs/models/RequiredClassRequiredNotnullableEnumInteger.md
 docs/models/RequiredClassRequiredNotnullableEnumIntegerOnly.md
 docs/models/RequiredClassRequiredNotnullableEnumString.md
@@ -121,8 +129,12 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
+docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
+docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumQueryStringParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
@@ -140,6 +152,18 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md
 docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -215,7 +239,9 @@ src/Org.OpenAPITools/Model/EnumClass.cs
 src/Org.OpenAPITools/Model/EnumTest.cs
 src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs
 src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 src/Org.OpenAPITools/Model/EnumTestEnumString.cs
+src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 src/Org.OpenAPITools/Model/EquilateralTriangle.cs
 src/Org.OpenAPITools/Model/File.cs
 src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -268,6 +294,12 @@ src/Org.OpenAPITools/Model/Quadrilateral.cs
 src/Org.OpenAPITools/Model/QuadrilateralInterface.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/RequiredClass.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs
@@ -289,8 +321,12 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
index 8e6e916f99eb..7b23eafe7ee8 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
@@ -763,7 +763,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -781,7 +781,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -1758,13 +1758,13 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_integer_only:
           $ref: "#/components/schemas/Enum_Test_enum_integer_only"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -2122,25 +2122,25 @@ components:
         required_notnullable_enum_integer:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
         notrequired_nullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer"
         notrequired_notnullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer"
         required_nullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
         required_notnullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
         notrequired_nullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer_only"
         notrequired_notnullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer_only"
         required_notnullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
         required_nullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
         notrequired_nullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_string"
         notrequired_notnullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_string"
         required_nullable_outerEnumDefaultValue:
           allOf:
           - $ref: "#/components/schemas/OuterEnumDefaultValue"
@@ -2819,6 +2819,32 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -2977,6 +3003,19 @@ components:
         value
       - "Duplicate\r\nvalue"
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
@@ -2988,6 +3027,12 @@ components:
       - 2
       - -2
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_of_enum_string_value:
       enum:
       - UPPER
@@ -3017,6 +3062,20 @@ components:
       format: int32
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: false
+      type: integer
     RequiredClass_required_nullable_enum_integer_only:
       enum:
       - 2
@@ -3029,6 +3088,18 @@ components:
       - -2
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: false
+      type: integer
     RequiredClass_required_notnullable_enum_string:
       enum:
       - UPPER
@@ -3057,6 +3128,34 @@ components:
       - "Duplicate\r\nvalue"
       nullable: true
       type: string
+    RequiredClass_notrequired_nullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: true
+      type: string
+    RequiredClass_notrequired_notnullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: false
+      type: string
     zebra_type:
       enum:
       - plains
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
index abf12b49fbf0..c9d830501c3d 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersEnumHeaderStringArrayParameterInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryStringParameter enumQueryString = null, List<TestEnumParametersEnumQueryStringArrayParameterInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,12 +496,12 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
-| **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderStringArray** | [**List&lt;TestEnumParametersEnumHeaderStringArrayParameterInner&gt;**](TestEnumParametersEnumHeaderStringArrayParameterInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
+| **enumQueryString** | **TestEnumParametersEnumQueryStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersEnumQueryStringArrayParameterInner&gt;**](TestEnumParametersEnumQueryStringArrayParameterInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTest.md
index 898c1ea1fb69..d95c14ac3f1f 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **EnumTestEnumString** |  | 
+**EnumStringRequired** | **EnumTestEnumStringRequired** |  | 
 **EnumInteger** | **EnumTestEnumInteger** |  | [optional] 
 **EnumIntegerOnly** | **EnumTestEnumIntegerOnly** |  | [optional] 
-**EnumNumber** | **TestEnumParametersEnumQueryDoubleParameter** |  | [optional] 
+**EnumNumber** | **EnumTestEnumNumber** |  | [optional] 
 **EnumString** | **EnumTestEnumString** |  | [optional] 
 **OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumNumber.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..2a2cd4d7d639
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumStringRequired.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..ca87d4b399f9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumStringRequired
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClass.md
index 2c792f6b2197..83eb241e197d 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClass.md
@@ -22,18 +22,18 @@ Name | Type | Description | Notes
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNotnullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNotnullableEnumInteger** | **RequiredClassRequiredNotnullableEnumInteger** |  | [optional] 
-**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassRequiredNotnullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNotnullableEnumString** | **RequiredClassRequiredNotnullableEnumString** |  | [optional] 
+**NotrequiredNotnullableEnumInteger** | **RequiredClassNotrequiredNotnullableEnumInteger** |  | [optional] 
+**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassNotrequiredNotnullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNotnullableEnumString** | **RequiredClassNotrequiredNotnullableEnumString** |  | [optional] 
 **NotrequiredNotnullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNotnullableStringProp** | **string** |  | [optional] 
 **NotrequiredNotnullableUuid** | **Guid** |  | [optional] 
 **NotrequiredNullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNullableEnumInteger** | **RequiredClassRequiredNullableEnumInteger** |  | [optional] 
-**NotrequiredNullableEnumIntegerOnly** | **RequiredClassRequiredNullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNullableEnumString** | **RequiredClassRequiredNullableEnumString** |  | [optional] 
+**NotrequiredNullableEnumInteger** | **RequiredClassNotrequiredNullableEnumInteger** |  | [optional] 
+**NotrequiredNullableEnumIntegerOnly** | **RequiredClassNotrequiredNullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNullableEnumString** | **RequiredClassNotrequiredNullableEnumString** |  | [optional] 
 **NotrequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNullableStringProp** | **string** |  | [optional] 
 **NotrequiredNullableUuid** | **Guid** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
new file mode 100644
index 000000000000..54873b1a91c9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0e04532adc7f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
new file mode 100644
index 000000000000..63d7c1cc12a5
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
new file mode 100644
index 000000000000..66ff81394f9f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0d27d688a88a
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
new file mode 100644
index 000000000000..1f98f53b8d73
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
new file mode 100644
index 000000000000..237e2a46d9c8
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..b5768f76fa5c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..d8ea29aecc57
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..49b8d9b71972
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
new file mode 100644
index 000000000000..a17804224bf6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumNumberTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumNumber
+        //private EnumTestEnumNumber instance;
+
+        public EnumTestEnumNumberTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumNumber
+            //instance = new EnumTestEnumNumber();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumNumber
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumNumber
+            //Assert.IsType<EnumTestEnumNumber>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
new file mode 100644
index 000000000000..d8772eebc7a0
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumStringRequired
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumStringRequiredTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumStringRequired
+        //private EnumTestEnumStringRequired instance;
+
+        public EnumTestEnumStringRequiredTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumStringRequired
+            //instance = new EnumTestEnumStringRequired();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumStringRequired
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumStringRequiredInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumStringRequired
+            //Assert.IsType<EnumTestEnumStringRequired>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..1a8374174269
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNotnullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNotnullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..1d5cfc6361c7
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumInteger
+        //private RequiredClassNotrequiredNotnullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumInteger
+            //instance = new RequiredClassNotrequiredNotnullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
new file mode 100644
index 000000000000..daee0a9ac47f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumString
+        //private RequiredClassNotrequiredNotnullableEnumString instance;
+
+        public RequiredClassNotrequiredNotnullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumString
+            //instance = new RequiredClassNotrequiredNotnullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..f3f14fcc5be9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..40a592e8a6bd
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumInteger
+        //private RequiredClassNotrequiredNullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumInteger
+            //instance = new RequiredClassNotrequiredNullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
new file mode 100644
index 000000000000..a6365769b618
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumString
+        //private RequiredClassNotrequiredNullableEnumString instance;
+
+        public RequiredClassNotrequiredNullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumString
+            //instance = new RequiredClassNotrequiredNullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..e85eeb06c47c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringArrayParameterInner
+        //private TestEnumParametersEnumHeaderStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumHeaderStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+            //instance = new TestEnumParametersEnumHeaderStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumHeaderStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
new file mode 100644
index 000000000000..13a2e1eb54fc
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringParameter
+        //private TestEnumParametersEnumHeaderStringParameter instance;
+
+        public TestEnumParametersEnumHeaderStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringParameter
+            //instance = new TestEnumParametersEnumHeaderStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringParameter
+            //Assert.IsType<TestEnumParametersEnumHeaderStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..aec190213b9e
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringArrayParameterInner
+        //private TestEnumParametersEnumQueryStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumQueryStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+            //instance = new TestEnumParametersEnumQueryStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumQueryStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
new file mode 100644
index 000000000000..6aa7849dfb33
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringParameter
+        //private TestEnumParametersEnumQueryStringParameter instance;
+
+        public TestEnumParametersEnumQueryStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringParameter
+            //instance = new TestEnumParametersEnumQueryStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringParameter
+            //Assert.IsType<TestEnumParametersEnumQueryStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 53ad97cbc3c1..b38628c9a5ca 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4459,7 +4459,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumFormStringArray));
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index df3b3537a120..c1c294f1b978 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -170,8 +170,12 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString();
             if (obj is EnumTestEnumIntegerOnly enumTestEnumIntegerOnly)
                 return EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString();
+            if (obj is EnumTestEnumNumber enumTestEnumNumber)
+                return EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString();
             if (obj is EnumTestEnumString enumTestEnumString)
                 return EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString);
+            if (obj is EnumTestEnumStringRequired enumTestEnumStringRequired)
+                return EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired);
             if (obj is FindPetsByStatusStatusParameterInner findPetsByStatusStatusParameterInner)
                 return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner);
             if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue)
@@ -190,6 +194,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return OuterEnumTestValueConverter.ToJsonValue(outerEnumTest);
             if (obj is PetStatus petStatus)
                 return PetStatusValueConverter.ToJsonValue(petStatus);
+            if (obj is RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger)
+                return RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString)
+                return RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString);
+            if (obj is RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger)
+                return RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString)
+                return RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString);
             if (obj is RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger)
                 return RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString();
             if (obj is RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly)
@@ -204,10 +220,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
+            if (obj is TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner)
+                return TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
+                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
                 return TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString();
+            if (obj is TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner)
+                return TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter)
+                return TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter);
             if (obj is TestEnumParametersRequestEnumFormString testEnumParametersRequestEnumFormString)
                 return TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString);
             if (obj is TestEnumParametersRequestEnumFormStringArrayInner testEnumParametersRequestEnumFormStringArrayInner)
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 86e57f6fc333..a505c30de262 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -85,8 +85,12 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredNullableJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
             _jsonOptions.Converters.Add(new FileSchemaTestClassJsonConverter());
@@ -148,6 +152,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new QuadrilateralInterfaceJsonConverter());
             _jsonOptions.Converters.Add(new ReadOnlyFirstJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter());
@@ -176,10 +192,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringArrayInnerJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
index 2de2f5e8414e..c827324ac511 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -42,7 +42,7 @@ public partial class EnumTest : IValidatableObject
         /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
         [JsonConstructor]
-        public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
+        public EnumTest(EnumTestEnumStringRequired enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<EnumTestEnumNumber?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
         {
             EnumStringRequired = enumStringRequired;
             EnumIntegerOption = enumInteger;
@@ -62,7 +62,7 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// Gets or Sets EnumStringRequired
         /// </summary>
         [JsonPropertyName("enum_string_required")]
-        public EnumTestEnumString EnumStringRequired { get; set; }
+        public EnumTestEnumStringRequired EnumStringRequired { get; set; }
 
         /// <summary>
         /// Used to track the state of EnumInteger
@@ -95,13 +95,13 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<TestEnumParametersEnumQueryDoubleParameter?> EnumNumberOption { get; private set; }
+        public Option<EnumTestEnumNumber?> EnumNumberOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets EnumNumber
         /// </summary>
         [JsonPropertyName("enum_number")]
-        public TestEnumParametersEnumQueryDoubleParameter? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
+        public EnumTestEnumNumber? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of EnumString
@@ -229,10 +229,10 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<EnumTestEnumString?> enumStringRequired = default;
+            Option<EnumTestEnumStringRequired?> enumStringRequired = default;
             Option<EnumTestEnumInteger?> enumInteger = default;
             Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default;
-            Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default;
+            Option<EnumTestEnumNumber?> enumNumber = default;
             Option<EnumTestEnumString?> enumString = default;
             Option<OuterEnum?> outerEnum = default;
             Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default;
@@ -257,7 +257,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_string_required":
                             string enumStringRequiredRawValue = utf8JsonReader.GetString();
                             if (enumStringRequiredRawValue != null)
-                                enumStringRequired = new Option<EnumTestEnumString?>(EnumTestEnumStringValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
+                                enumStringRequired = new Option<EnumTestEnumStringRequired?>(EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
                             break;
                         case "enum_integer":
                             string enumIntegerRawValue = utf8JsonReader.GetString();
@@ -272,7 +272,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_number":
                             string enumNumberRawValue = utf8JsonReader.GetString();
                             if (enumNumberRawValue != null)
-                                enumNumber = new Option<TestEnumParametersEnumQueryDoubleParameter?>(TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(enumNumberRawValue));
+                                enumNumber = new Option<EnumTestEnumNumber?>(EnumTestEnumNumberValueConverter.FromStringOrDefault(enumNumberRawValue));
                             break;
                         case "enum_string":
                             string enumStringRawValue = utf8JsonReader.GetString();
@@ -358,7 +358,7 @@ public override void Write(Utf8JsonWriter writer, EnumTest enumTest, JsonSeriali
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerializerOptions jsonSerializerOptions)
         {
-            var enumStringRequiredRawValue = EnumTestEnumStringValueConverter.ToJsonValue(enumTest.EnumStringRequired);
+            var enumStringRequiredRawValue = EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTest.EnumStringRequired);
             writer.WriteString("enum_string_required", enumStringRequiredRawValue);
 
             if (enumTest.EnumIntegerOption.IsSet)
@@ -373,7 +373,7 @@ public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerial
             }
             if (enumTest.EnumNumberOption.IsSet)
             {
-                var enumNumberRawValue = TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
+                var enumNumberRawValue = EnumTestEnumNumberValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
                 writer.WriteNumber("enum_number", enumNumberRawValue);
             }
             if (enumTest.EnumStringOption.IsSet)
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
new file mode 100644
index 000000000000..d2fe5cf7c218
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_number
+    /// </summary>
+    public enum EnumTestEnumNumber
+    {
+        /// <summary>
+        /// Enum NUMBER_1_DOT_1 for value: 1.1
+        /// </summary>
+        NUMBER_1_DOT_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+        /// </summary>
+        NUMBER_MINUS_1_DOT_2 = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumNumber"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumNumberValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber FromString(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumNumber: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber? FromStringOrDefault(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumNumber"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static double ToJsonValue(EnumTestEnumNumber value)
+        {
+            return (double) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumNumberJsonConverter : JsonConverter<EnumTestEnumNumber>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    public class EnumTestEnumNumberNullableJsonConverter : JsonConverter<EnumTestEnumNumber?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumNumber from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber? enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumNumber.HasValue ? EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
new file mode 100644
index 000000000000..399e522b7c0c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_string_required
+    /// </summary>
+    public enum EnumTestEnumStringRequired
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumStringRequired"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumStringRequiredValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumStringRequired: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumStringRequired"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(EnumTestEnumStringRequired value)
+        {
+            if (value == EnumTestEnumStringRequired.UPPER)
+                return "UPPER";
+
+            if (value == EnumTestEnumStringRequired.Lower)
+                return "lower";
+
+            if (value == EnumTestEnumStringRequired.Empty)
+                return "";
+
+            if (value == EnumTestEnumStringRequired.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == EnumTestEnumStringRequired.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == EnumTestEnumStringRequired.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumStringRequiredJsonConverter : JsonConverter<EnumTestEnumStringRequired>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    public class EnumTestEnumStringRequiredNullableJsonConverter : JsonConverter<EnumTestEnumStringRequired?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumStringRequired from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired? enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumStringRequired.HasValue ? EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
index ef0b4ec5b61c..f8085e0c93cb 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ public partial class RequiredClass : IValidatableObject
         /// <param name="requiredNullableStringProp">requiredNullableStringProp</param>
         /// <param name="requiredNullableUuid">requiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -157,39 +157,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer")]
-        public RequiredClassRequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer_only")]
-        public RequiredClassRequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_string")]
-        public RequiredClassRequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableOuterEnumDefaultValue
@@ -209,39 +209,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer")]
-        public RequiredClassRequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer_only")]
-        public RequiredClassRequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_string")]
-        public RequiredClassRequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableOuterEnumDefaultValue
@@ -704,18 +704,18 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
             Option<DateTime?> notrequiredNotnullableDatetimeProp = default;
-            Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
-            Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
+            Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNotnullableStringProp = default;
             Option<Guid?> notrequiredNotnullableUuid = default;
             Option<List<string>> notrequiredNullableArrayOfString = default;
             Option<bool?> notrequiredNullableBooleanProp = default;
             Option<DateTime?> notrequiredNullableDatetimeProp = default;
-            Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
-            Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default;
+            Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNullableStringProp = default;
             Option<Guid?> notrequiredNullableUuid = default;
@@ -811,17 +811,17 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                         case "notrequired_notnullable_enum_integer":
                             string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerRawValue != null)
-                                notrequiredNotnullableEnumInteger = new Option<RequiredClassRequiredNotnullableEnumInteger?>(RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
+                                notrequiredNotnullableEnumInteger = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
                             break;
                         case "notrequired_notnullable_enum_integer_only":
                             string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerOnlyRawValue != null)
-                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
+                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_notnullable_enum_string":
                             string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumStringRawValue != null)
-                                notrequiredNotnullableEnumString = new Option<RequiredClassRequiredNotnullableEnumString?>(RequiredClassRequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
+                                notrequiredNotnullableEnumString = new Option<RequiredClassNotrequiredNotnullableEnumString?>(RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
                             break;
                         case "notrequired_notnullable_outerEnumDefaultValue":
                             string notrequiredNotnullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -845,15 +845,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "notrequired_nullable_enum_integer":
                             string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumInteger = new Option<RequiredClassRequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
+                            notrequiredNullableEnumInteger = new Option<RequiredClassNotrequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
                             break;
                         case "notrequired_nullable_enum_integer_only":
                             string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
+                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_nullable_enum_string":
                             string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumString = new Option<RequiredClassRequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
+                            notrequiredNullableEnumString = new Option<RequiredClassNotrequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
                             break;
                         case "notrequired_nullable_outerEnumDefaultValue":
                             string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -1136,17 +1136,17 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
 
             if (requiredClass.NotrequiredNotnullableEnumIntegerOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
+                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer", notrequiredNotnullableEnumIntegerRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumIntegerOnlyOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
+                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer_only", notrequiredNotnullableEnumIntegerOnlyRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumStringOption.IsSet)
             {
-                var notrequiredNotnullableEnumStringRawValue = RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
+                var notrequiredNotnullableEnumStringRawValue = RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
                 writer.WriteString("notrequired_notnullable_enum_string", notrequiredNotnullableEnumStringRawValue);
             }
             if (requiredClass.NotrequiredNotnullableOuterEnumDefaultValueOption.IsSet)
@@ -1183,7 +1183,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerRawValue = RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
+                    var notrequiredNullableEnumIntegerRawValue = RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer", notrequiredNullableEnumIntegerRawValue);
                 }
                 else
@@ -1191,7 +1191,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
+                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer_only", notrequiredNullableEnumIntegerOnlyRawValue);
                 }
                 else
@@ -1199,7 +1199,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumStringOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumStringOption.Value != null)
                 {
-                    var notrequiredNullableEnumStringRawValue = RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
+                    var notrequiredNullableEnumStringRawValue = RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
                     writer.WriteString("notrequired_nullable_enum_string", notrequiredNullableEnumStringRawValue);
                 }
                 else
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
new file mode 100644
index 000000000000..03c6331d3658
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger? requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumInteger.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..c8e2c8d8619c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly? requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
new file mode 100644
index 000000000000..99c807384c10
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNotnullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNotnullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString? requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumString.HasValue ? RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
new file mode 100644
index 000000000000..73e23e577c36
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger? requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumInteger.HasValue ? RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..703154711431
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly? requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
new file mode 100644
index 000000000000..b20fd9668c26
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString? requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumString.HasValue ? RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
new file mode 100644
index 000000000000..19c0f7913257
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner? testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringArrayParameterInner.HasValue ? TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
new file mode 100644
index 000000000000..4fe8d2deb709
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringParameter value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
new file mode 100644
index 000000000000..8987ec0636e6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner? testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringArrayParameterInner.HasValue ? TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
new file mode 100644
index 000000000000..3adbbcc0c4c6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringParameter value)
+        {
+            if (value == TestEnumParametersEnumQueryStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter? testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringParameter.HasValue ? TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
index cacee1eafc1b..4d4d8890e63a 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
@@ -47,7 +47,9 @@ docs/models/EnumClass.md
 docs/models/EnumTest.md
 docs/models/EnumTestEnumInteger.md
 docs/models/EnumTestEnumIntegerOnly.md
+docs/models/EnumTestEnumNumber.md
 docs/models/EnumTestEnumString.md
+docs/models/EnumTestEnumStringRequired.md
 docs/models/EquilateralTriangle.md
 docs/models/File.md
 docs/models/FileSchemaTestClass.md
@@ -100,6 +102,12 @@ docs/models/Quadrilateral.md
 docs/models/QuadrilateralInterface.md
 docs/models/ReadOnlyFirst.md
 docs/models/RequiredClass.md
+docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNotnullableEnumString.md
+docs/models/RequiredClassNotrequiredNullableEnumInteger.md
+docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
+docs/models/RequiredClassNotrequiredNullableEnumString.md
 docs/models/RequiredClassRequiredNotnullableEnumInteger.md
 docs/models/RequiredClassRequiredNotnullableEnumIntegerOnly.md
 docs/models/RequiredClassRequiredNotnullableEnumString.md
@@ -121,8 +129,12 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
+docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
+docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/models/TestEnumParametersEnumQueryStringParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
 docs/models/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/models/TestInlineFreeformAdditionalPropertiesRequest.md
@@ -140,6 +152,18 @@ docs/models/ZeroBasedEnumClassZeroBasedEnum.md
 docs/scripts/git_push.ps1
 docs/scripts/git_push.sh
 src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
+src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
+src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
+src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools.Test/README.md
 src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -215,7 +239,9 @@ src/Org.OpenAPITools/Model/EnumClass.cs
 src/Org.OpenAPITools/Model/EnumTest.cs
 src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs
 src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
 src/Org.OpenAPITools/Model/EnumTestEnumString.cs
+src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
 src/Org.OpenAPITools/Model/EquilateralTriangle.cs
 src/Org.OpenAPITools/Model/File.cs
 src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
@@ -268,6 +294,12 @@ src/Org.OpenAPITools/Model/Quadrilateral.cs
 src/Org.OpenAPITools/Model/QuadrilateralInterface.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/RequiredClass.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
+src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs
 src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs
@@ -289,8 +321,12 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
+src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs
 src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
index 8e6e916f99eb..7b23eafe7ee8 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
@@ -763,7 +763,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -781,7 +781,7 @@ paths:
         required: false
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -1758,13 +1758,13 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_integer_only:
           $ref: "#/components/schemas/Enum_Test_enum_integer_only"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -2122,25 +2122,25 @@ components:
         required_notnullable_enum_integer:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
         notrequired_nullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer"
         notrequired_notnullable_enum_integer:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer"
         required_nullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
         required_notnullable_enum_integer_only:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
         notrequired_nullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_integer_only"
         notrequired_notnullable_enum_integer_only:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_integer_only"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_integer_only"
         required_notnullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
         required_nullable_enum_string:
           $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
         notrequired_nullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_nullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_nullable_enum_string"
         notrequired_notnullable_enum_string:
-          $ref: "#/components/schemas/RequiredClass_required_notnullable_enum_string"
+          $ref: "#/components/schemas/RequiredClass_notrequired_notnullable_enum_string"
         required_nullable_outerEnumDefaultValue:
           allOf:
           - $ref: "#/components/schemas/OuterEnumDefaultValue"
@@ -2819,6 +2819,32 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -2977,6 +3003,19 @@ components:
         value
       - "Duplicate\r\nvalue"
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
@@ -2988,6 +3027,12 @@ components:
       - 2
       - -2
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_of_enum_string_value:
       enum:
       - UPPER
@@ -3017,6 +3062,20 @@ components:
       format: int32
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      nullable: false
+      type: integer
     RequiredClass_required_nullable_enum_integer_only:
       enum:
       - 2
@@ -3029,6 +3088,18 @@ components:
       - -2
       nullable: false
       type: integer
+    RequiredClass_notrequired_nullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: true
+      type: integer
+    RequiredClass_notrequired_notnullable_enum_integer_only:
+      enum:
+      - 2
+      - -2
+      nullable: false
+      type: integer
     RequiredClass_required_notnullable_enum_string:
       enum:
       - UPPER
@@ -3057,6 +3128,34 @@ components:
       - "Duplicate\r\nvalue"
       nullable: true
       type: string
+    RequiredClass_notrequired_nullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: true
+      type: string
+    RequiredClass_notrequired_notnullable_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      - "Value\twith tab"
+      - Value with " quote
+      - Value with escaped \" quote
+      - |-
+        Duplicate
+        value
+      - "Duplicate\r\nvalue"
+      nullable: false
+      type: string
     zebra_type:
       enum:
       - plains
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
index abf12b49fbf0..c9d830501c3d 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersEnumHeaderStringArrayParameterInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumQueryStringParameter enumQueryString = null, List<TestEnumParametersEnumQueryStringArrayParameterInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,12 +496,12 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
-| **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderStringArray** | [**List&lt;TestEnumParametersEnumHeaderStringArrayParameterInner&gt;**](TestEnumParametersEnumHeaderStringArrayParameterInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
-| **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
+| **enumQueryString** | **TestEnumParametersEnumQueryStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryStringArray** | [**List&lt;TestEnumParametersEnumQueryStringArrayParameterInner&gt;**](TestEnumParametersEnumQueryStringArrayParameterInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTest.md
index 898c1ea1fb69..d95c14ac3f1f 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTest.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumStringRequired** | **EnumTestEnumString** |  | 
+**EnumStringRequired** | **EnumTestEnumStringRequired** |  | 
 **EnumInteger** | **EnumTestEnumInteger** |  | [optional] 
 **EnumIntegerOnly** | **EnumTestEnumIntegerOnly** |  | [optional] 
-**EnumNumber** | **TestEnumParametersEnumQueryDoubleParameter** |  | [optional] 
+**EnumNumber** | **EnumTestEnumNumber** |  | [optional] 
 **EnumString** | **EnumTestEnumString** |  | [optional] 
 **OuterEnum** | **OuterEnum** |  | [optional] 
 **OuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumNumber.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..2a2cd4d7d639
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumStringRequired.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..ca87d4b399f9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.EnumTestEnumStringRequired
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClass.md
index 2c792f6b2197..83eb241e197d 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClass.md
@@ -22,18 +22,18 @@ Name | Type | Description | Notes
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNotnullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNotnullableEnumInteger** | **RequiredClassRequiredNotnullableEnumInteger** |  | [optional] 
-**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassRequiredNotnullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNotnullableEnumString** | **RequiredClassRequiredNotnullableEnumString** |  | [optional] 
+**NotrequiredNotnullableEnumInteger** | **RequiredClassNotrequiredNotnullableEnumInteger** |  | [optional] 
+**NotrequiredNotnullableEnumIntegerOnly** | **RequiredClassNotrequiredNotnullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNotnullableEnumString** | **RequiredClassNotrequiredNotnullableEnumString** |  | [optional] 
 **NotrequiredNotnullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNotnullableStringProp** | **string** |  | [optional] 
 **NotrequiredNotnullableUuid** | **Guid** |  | [optional] 
 **NotrequiredNullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNullableBooleanProp** | **bool** |  | [optional] 
 **NotrequiredNullableDatetimeProp** | **DateTime** |  | [optional] 
-**NotrequiredNullableEnumInteger** | **RequiredClassRequiredNullableEnumInteger** |  | [optional] 
-**NotrequiredNullableEnumIntegerOnly** | **RequiredClassRequiredNullableEnumIntegerOnly** |  | [optional] 
-**NotrequiredNullableEnumString** | **RequiredClassRequiredNullableEnumString** |  | [optional] 
+**NotrequiredNullableEnumInteger** | **RequiredClassNotrequiredNullableEnumInteger** |  | [optional] 
+**NotrequiredNullableEnumIntegerOnly** | **RequiredClassNotrequiredNullableEnumIntegerOnly** |  | [optional] 
+**NotrequiredNullableEnumString** | **RequiredClassNotrequiredNullableEnumString** |  | [optional] 
 **NotrequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | [optional] 
 **NotrequiredNullableStringProp** | **string** |  | [optional] 
 **NotrequiredNullableUuid** | **Guid** |  | [optional] 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
new file mode 100644
index 000000000000..54873b1a91c9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0e04532adc7f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
new file mode 100644
index 000000000000..63d7c1cc12a5
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNotnullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNotnullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
new file mode 100644
index 000000000000..66ff81394f9f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumInteger.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
new file mode 100644
index 000000000000..0d27d688a88a
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumIntegerOnly.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumIntegerOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
new file mode 100644
index 000000000000..1f98f53b8d73
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/RequiredClassNotrequiredNullableEnumString.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.RequiredClassNotrequiredNullableEnumString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
new file mode 100644
index 000000000000..237e2a46d9c8
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..b5768f76fa5c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumHeaderStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..d8ea29aecc57
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..49b8d9b71972
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/models/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.TestEnumParametersEnumQueryStringParameter
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
new file mode 100644
index 000000000000..a17804224bf6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumNumberTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumNumberTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumNumber
+        //private EnumTestEnumNumber instance;
+
+        public EnumTestEnumNumberTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumNumber
+            //instance = new EnumTestEnumNumber();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumNumber
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumNumber
+            //Assert.IsType<EnumTestEnumNumber>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
new file mode 100644
index 000000000000..d8772eebc7a0
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/EnumTestEnumStringRequiredTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing EnumTestEnumStringRequired
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class EnumTestEnumStringRequiredTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for EnumTestEnumStringRequired
+        //private EnumTestEnumStringRequired instance;
+
+        public EnumTestEnumStringRequiredTests()
+        {
+            // TODO uncomment below to create an instance of EnumTestEnumStringRequired
+            //instance = new EnumTestEnumStringRequired();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of EnumTestEnumStringRequired
+        /// </summary>
+        [Fact]
+        public void EnumTestEnumStringRequiredInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" EnumTestEnumStringRequired
+            //Assert.IsType<EnumTestEnumStringRequired>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..1a8374174269
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNotnullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNotnullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..1d5cfc6361c7
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumInteger
+        //private RequiredClassNotrequiredNotnullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNotnullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumInteger
+            //instance = new RequiredClassNotrequiredNotnullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
new file mode 100644
index 000000000000..daee0a9ac47f
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNotnullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNotnullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNotnullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNotnullableEnumString
+        //private RequiredClassNotrequiredNotnullableEnumString instance;
+
+        public RequiredClassNotrequiredNotnullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNotnullableEnumString
+            //instance = new RequiredClassNotrequiredNotnullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNotnullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNotnullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNotnullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNotnullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
new file mode 100644
index 000000000000..f3f14fcc5be9
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerOnlyTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumIntegerOnly
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumIntegerOnly
+        //private RequiredClassNotrequiredNullableEnumIntegerOnly instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerOnlyTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+            //instance = new RequiredClassNotrequiredNullableEnumIntegerOnly();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumIntegerOnly
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerOnlyInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumIntegerOnly
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumIntegerOnly>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
new file mode 100644
index 000000000000..40a592e8a6bd
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumIntegerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumIntegerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumInteger
+        //private RequiredClassNotrequiredNullableEnumInteger instance;
+
+        public RequiredClassNotrequiredNullableEnumIntegerTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumInteger
+            //instance = new RequiredClassNotrequiredNullableEnumInteger();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumInteger
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumInteger
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumInteger>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
new file mode 100644
index 000000000000..a6365769b618
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/RequiredClassNotrequiredNullableEnumStringTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing RequiredClassNotrequiredNullableEnumString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class RequiredClassNotrequiredNullableEnumStringTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for RequiredClassNotrequiredNullableEnumString
+        //private RequiredClassNotrequiredNullableEnumString instance;
+
+        public RequiredClassNotrequiredNullableEnumStringTests()
+        {
+            // TODO uncomment below to create an instance of RequiredClassNotrequiredNullableEnumString
+            //instance = new RequiredClassNotrequiredNullableEnumString();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of RequiredClassNotrequiredNullableEnumString
+        /// </summary>
+        [Fact]
+        public void RequiredClassNotrequiredNullableEnumStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" RequiredClassNotrequiredNullableEnumString
+            //Assert.IsType<RequiredClassNotrequiredNullableEnumString>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..e85eeb06c47c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringArrayParameterInner
+        //private TestEnumParametersEnumHeaderStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumHeaderStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+            //instance = new TestEnumParametersEnumHeaderStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumHeaderStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
new file mode 100644
index 000000000000..13a2e1eb54fc
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumHeaderStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumHeaderStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumHeaderStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumHeaderStringParameter
+        //private TestEnumParametersEnumHeaderStringParameter instance;
+
+        public TestEnumParametersEnumHeaderStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumHeaderStringParameter
+            //instance = new TestEnumParametersEnumHeaderStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumHeaderStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumHeaderStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumHeaderStringParameter
+            //Assert.IsType<TestEnumParametersEnumHeaderStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
new file mode 100644
index 000000000000..aec190213b9e
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringArrayParameterInnerTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringArrayParameterInner
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringArrayParameterInner
+        //private TestEnumParametersEnumQueryStringArrayParameterInner instance;
+
+        public TestEnumParametersEnumQueryStringArrayParameterInnerTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+            //instance = new TestEnumParametersEnumQueryStringArrayParameterInner();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringArrayParameterInner
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringArrayParameterInnerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringArrayParameterInner
+            //Assert.IsType<TestEnumParametersEnumQueryStringArrayParameterInner>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
new file mode 100644
index 000000000000..6aa7849dfb33
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Model/TestEnumParametersEnumQueryStringParameterTests.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing TestEnumParametersEnumQueryStringParameter
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class TestEnumParametersEnumQueryStringParameterTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for TestEnumParametersEnumQueryStringParameter
+        //private TestEnumParametersEnumQueryStringParameter instance;
+
+        public TestEnumParametersEnumQueryStringParameterTests()
+        {
+            // TODO uncomment below to create an instance of TestEnumParametersEnumQueryStringParameter
+            //instance = new TestEnumParametersEnumQueryStringParameter();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of TestEnumParametersEnumQueryStringParameter
+        /// </summary>
+        [Fact]
+        public void TestEnumParametersEnumQueryStringParameterInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" TestEnumParametersEnumQueryStringParameter
+            //Assert.IsType<TestEnumParametersEnumQueryStringParameter>(instance);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 53ad97cbc3c1..b38628c9a5ca 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4459,7 +4459,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
         /// <param name="enumHeaderStringArray"></param>
         /// <param name="enumQueryStringArray"></param>
         /// <returns></returns>
-        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             if (enumFormStringArray.IsSet && enumFormStringArray.Value == null)
                 throw new ArgumentNullException(nameof(enumFormStringArray));
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersEnumHeaderStringArrayParameterInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumQueryStringParameter> enumQueryString = default, Option<List<TestEnumParametersEnumQueryStringArrayParameterInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index df3b3537a120..c1c294f1b978 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -170,8 +170,12 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString();
             if (obj is EnumTestEnumIntegerOnly enumTestEnumIntegerOnly)
                 return EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString();
+            if (obj is EnumTestEnumNumber enumTestEnumNumber)
+                return EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString();
             if (obj is EnumTestEnumString enumTestEnumString)
                 return EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString);
+            if (obj is EnumTestEnumStringRequired enumTestEnumStringRequired)
+                return EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired);
             if (obj is FindPetsByStatusStatusParameterInner findPetsByStatusStatusParameterInner)
                 return FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner);
             if (obj is MapTestMapOfEnumStringValue mapTestMapOfEnumStringValue)
@@ -190,6 +194,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return OuterEnumTestValueConverter.ToJsonValue(outerEnumTest);
             if (obj is PetStatus petStatus)
                 return PetStatusValueConverter.ToJsonValue(petStatus);
+            if (obj is RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger)
+                return RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString)
+                return RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString);
+            if (obj is RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger)
+                return RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly)
+                return RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString();
+            if (obj is RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString)
+                return RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString);
             if (obj is RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger)
                 return RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString();
             if (obj is RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly)
@@ -204,10 +220,18 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
+            if (obj is TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner)
+                return TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
+                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
                 return TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString();
+            if (obj is TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner)
+                return TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner);
+            if (obj is TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter)
+                return TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter);
             if (obj is TestEnumParametersRequestEnumFormString testEnumParametersRequestEnumFormString)
                 return TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString);
             if (obj is TestEnumParametersRequestEnumFormStringArrayInner testEnumParametersRequestEnumFormStringArrayInner)
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 86e57f6fc333..a505c30de262 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -85,8 +85,12 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumNumberNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredJsonConverter());
+            _jsonOptions.Converters.Add(new EnumTestEnumStringRequiredNullableJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
             _jsonOptions.Converters.Add(new FileSchemaTestClassJsonConverter());
@@ -148,6 +152,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new QuadrilateralInterfaceJsonConverter());
             _jsonOptions.Converters.Add(new ReadOnlyFirstJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringJsonConverter());
+            _jsonOptions.Converters.Add(new RequiredClassNotrequiredNullableEnumStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter());
             _jsonOptions.Converters.Add(new RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter());
@@ -176,10 +192,18 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterJsonConverter());
+            _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersRequestEnumFormStringArrayInnerJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
index 2de2f5e8414e..c827324ac511 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -42,7 +42,7 @@ public partial class EnumTest : IValidatableObject
         /// <param name="outerEnumInteger">outerEnumInteger</param>
         /// <param name="outerEnumIntegerDefaultValue">outerEnumIntegerDefaultValue</param>
         [JsonConstructor]
-        public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
+        public EnumTest(EnumTestEnumStringRequired enumStringRequired, Option<EnumTestEnumInteger?> enumInteger = default, Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default, Option<EnumTestEnumNumber?> enumNumber = default, Option<EnumTestEnumString?> enumString = default, Option<OuterEnum?> outerEnum = default, Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default, Option<OuterEnumInteger?> outerEnumInteger = default, Option<OuterEnumIntegerDefaultValue?> outerEnumIntegerDefaultValue = default)
         {
             EnumStringRequired = enumStringRequired;
             EnumIntegerOption = enumInteger;
@@ -62,7 +62,7 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// Gets or Sets EnumStringRequired
         /// </summary>
         [JsonPropertyName("enum_string_required")]
-        public EnumTestEnumString EnumStringRequired { get; set; }
+        public EnumTestEnumStringRequired EnumStringRequired { get; set; }
 
         /// <summary>
         /// Used to track the state of EnumInteger
@@ -95,13 +95,13 @@ public EnumTest(EnumTestEnumString enumStringRequired, Option<EnumTestEnumIntege
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<TestEnumParametersEnumQueryDoubleParameter?> EnumNumberOption { get; private set; }
+        public Option<EnumTestEnumNumber?> EnumNumberOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets EnumNumber
         /// </summary>
         [JsonPropertyName("enum_number")]
-        public TestEnumParametersEnumQueryDoubleParameter? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
+        public EnumTestEnumNumber? EnumNumber { get { return this.EnumNumberOption.Value; } set { this.EnumNumberOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of EnumString
@@ -229,10 +229,10 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<EnumTestEnumString?> enumStringRequired = default;
+            Option<EnumTestEnumStringRequired?> enumStringRequired = default;
             Option<EnumTestEnumInteger?> enumInteger = default;
             Option<EnumTestEnumIntegerOnly?> enumIntegerOnly = default;
-            Option<TestEnumParametersEnumQueryDoubleParameter?> enumNumber = default;
+            Option<EnumTestEnumNumber?> enumNumber = default;
             Option<EnumTestEnumString?> enumString = default;
             Option<OuterEnum?> outerEnum = default;
             Option<OuterEnumDefaultValue?> outerEnumDefaultValue = default;
@@ -257,7 +257,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_string_required":
                             string enumStringRequiredRawValue = utf8JsonReader.GetString();
                             if (enumStringRequiredRawValue != null)
-                                enumStringRequired = new Option<EnumTestEnumString?>(EnumTestEnumStringValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
+                                enumStringRequired = new Option<EnumTestEnumStringRequired?>(EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(enumStringRequiredRawValue));
                             break;
                         case "enum_integer":
                             string enumIntegerRawValue = utf8JsonReader.GetString();
@@ -272,7 +272,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
                         case "enum_number":
                             string enumNumberRawValue = utf8JsonReader.GetString();
                             if (enumNumberRawValue != null)
-                                enumNumber = new Option<TestEnumParametersEnumQueryDoubleParameter?>(TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(enumNumberRawValue));
+                                enumNumber = new Option<EnumTestEnumNumber?>(EnumTestEnumNumberValueConverter.FromStringOrDefault(enumNumberRawValue));
                             break;
                         case "enum_string":
                             string enumStringRawValue = utf8JsonReader.GetString();
@@ -358,7 +358,7 @@ public override void Write(Utf8JsonWriter writer, EnumTest enumTest, JsonSeriali
         /// <exception cref="NotImplementedException"></exception>
         public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerializerOptions jsonSerializerOptions)
         {
-            var enumStringRequiredRawValue = EnumTestEnumStringValueConverter.ToJsonValue(enumTest.EnumStringRequired);
+            var enumStringRequiredRawValue = EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTest.EnumStringRequired);
             writer.WriteString("enum_string_required", enumStringRequiredRawValue);
 
             if (enumTest.EnumIntegerOption.IsSet)
@@ -373,7 +373,7 @@ public void WriteProperties(Utf8JsonWriter writer, EnumTest enumTest, JsonSerial
             }
             if (enumTest.EnumNumberOption.IsSet)
             {
-                var enumNumberRawValue = TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
+                var enumNumberRawValue = EnumTestEnumNumberValueConverter.ToJsonValue(enumTest.EnumNumber.Value);
                 writer.WriteNumber("enum_number", enumNumberRawValue);
             }
             if (enumTest.EnumStringOption.IsSet)
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
new file mode 100644
index 000000000000..d2fe5cf7c218
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumNumber.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_number
+    /// </summary>
+    public enum EnumTestEnumNumber
+    {
+        /// <summary>
+        /// Enum NUMBER_1_DOT_1 for value: 1.1
+        /// </summary>
+        NUMBER_1_DOT_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1_DOT_2 for value: -1.2
+        /// </summary>
+        NUMBER_MINUS_1_DOT_2 = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumNumber"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumNumberValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber FromString(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumNumber: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumNumber"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumNumber? FromStringOrDefault(string value)
+        {
+            if (value.Equals("1.1"))
+                return EnumTestEnumNumber.NUMBER_1_DOT_1;
+
+            if (value.Equals("-1.2"))
+                return EnumTestEnumNumber.NUMBER_MINUS_1_DOT_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumNumber"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static double ToJsonValue(EnumTestEnumNumber value)
+        {
+            return (double) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumNumberJsonConverter : JsonConverter<EnumTestEnumNumber>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumNumber"/>
+    /// </summary>
+    public class EnumTestEnumNumberNullableJsonConverter : JsonConverter<EnumTestEnumNumber?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumNumber from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumNumber? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumNumber? result = rawValue == null
+                ? null
+                : EnumTestEnumNumberValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumNumber to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumNumber"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumNumber? enumTestEnumNumber, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumNumber.HasValue ? EnumTestEnumNumberValueConverter.ToJsonValue(enumTestEnumNumber.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
new file mode 100644
index 000000000000..399e522b7c0c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumStringRequired.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines Enum_Test_enum_string_required
+    /// </summary>
+    public enum EnumTestEnumStringRequired
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="EnumTestEnumStringRequired"/> to and from the JSON value
+    /// </summary>
+    public static class EnumTestEnumStringRequiredValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type EnumTestEnumStringRequired: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="EnumTestEnumStringRequired"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static EnumTestEnumStringRequired? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return EnumTestEnumStringRequired.UPPER;
+
+            if (value.Equals("lower"))
+                return EnumTestEnumStringRequired.Lower;
+
+            if (value.Equals(""))
+                return EnumTestEnumStringRequired.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return EnumTestEnumStringRequired.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return EnumTestEnumStringRequired.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return EnumTestEnumStringRequired.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return EnumTestEnumStringRequired.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="EnumTestEnumStringRequired"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(EnumTestEnumStringRequired value)
+        {
+            if (value == EnumTestEnumStringRequired.UPPER)
+                return "UPPER";
+
+            if (value == EnumTestEnumStringRequired.Lower)
+                return "lower";
+
+            if (value == EnumTestEnumStringRequired.Empty)
+                return "";
+
+            if (value == EnumTestEnumStringRequired.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == EnumTestEnumStringRequired.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == EnumTestEnumStringRequired.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == EnumTestEnumStringRequired.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumTestEnumStringRequiredJsonConverter : JsonConverter<EnumTestEnumStringRequired>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="EnumTestEnumStringRequired"/>
+    /// </summary>
+    public class EnumTestEnumStringRequiredNullableJsonConverter : JsonConverter<EnumTestEnumStringRequired?>
+    {
+        /// <summary>
+        /// Returns a EnumTestEnumStringRequired from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override EnumTestEnumStringRequired? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            EnumTestEnumStringRequired? result = rawValue == null
+                ? null
+                : EnumTestEnumStringRequiredValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the EnumTestEnumStringRequired to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="enumTestEnumStringRequired"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, EnumTestEnumStringRequired? enumTestEnumStringRequired, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(enumTestEnumStringRequired.HasValue ? EnumTestEnumStringRequiredValueConverter.ToJsonValue(enumTestEnumStringRequired.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
index ef0b4ec5b61c..f8085e0c93cb 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ public partial class RequiredClass : IValidatableObject
         /// <param name="requiredNullableStringProp">requiredNullableStringProp</param>
         /// <param name="requiredNullableUuid">requiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredClassRequiredNotnullableEnumInteger requiredNotnullableEnumInteger, RequiredClassRequiredNotnullableEnumIntegerOnly requiredNotnullableEnumIntegerOnly, RequiredClassRequiredNotnullableEnumString requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default, Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default, Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default, Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredClassRequiredNullableEnumInteger? requiredNullableEnumInteger = default, RequiredClassRequiredNullableEnumIntegerOnly? requiredNullableEnumIntegerOnly = default, RequiredClassRequiredNullableEnumString? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -157,39 +157,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumInteger?> NotrequiredNotnullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer")]
-        public RequiredClassRequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumInteger? NotrequiredNotnullableEnumInteger { get { return this.NotrequiredNotnullableEnumIntegerOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> NotrequiredNotnullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_integer_only")]
-        public RequiredClassRequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumIntegerOnly? NotrequiredNotnullableEnumIntegerOnly { get { return this.NotrequiredNotnullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNotnullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNotnullableEnumString?> NotrequiredNotnullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNotnullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_notnullable_enum_string")]
-        public RequiredClassRequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNotnullableEnumString? NotrequiredNotnullableEnumString { get { return this.NotrequiredNotnullableEnumStringOption.Value; } set { this.NotrequiredNotnullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNotnullableOuterEnumDefaultValue
@@ -209,39 +209,39 @@ public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> required
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumInteger?> NotrequiredNullableEnumIntegerOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumInteger
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer")]
-        public RequiredClassRequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumInteger? NotrequiredNullableEnumInteger { get { return this.NotrequiredNullableEnumIntegerOption.Value; } set { this.NotrequiredNullableEnumIntegerOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> NotrequiredNullableEnumIntegerOnlyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumIntegerOnly
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_integer_only")]
-        public RequiredClassRequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumIntegerOnly? NotrequiredNullableEnumIntegerOnly { get { return this.NotrequiredNullableEnumIntegerOnlyOption.Value; } set { this.NotrequiredNullableEnumIntegerOnlyOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableEnumString
         /// </summary>
         [JsonIgnore]
         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<RequiredClassRequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
+        public Option<RequiredClassNotrequiredNullableEnumString?> NotrequiredNullableEnumStringOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotrequiredNullableEnumString
         /// </summary>
         [JsonPropertyName("notrequired_nullable_enum_string")]
-        public RequiredClassRequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
+        public RequiredClassNotrequiredNullableEnumString? NotrequiredNullableEnumString { get { return this.NotrequiredNullableEnumStringOption.Value; } set { this.NotrequiredNullableEnumStringOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotrequiredNullableOuterEnumDefaultValue
@@ -704,18 +704,18 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
             Option<DateTime?> notrequiredNotnullableDatetimeProp = default;
-            Option<RequiredClassRequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
-            Option<RequiredClassRequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
+            Option<RequiredClassNotrequiredNotnullableEnumInteger?> notrequiredNotnullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?> notrequiredNotnullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNotnullableEnumString?> notrequiredNotnullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNotnullableStringProp = default;
             Option<Guid?> notrequiredNotnullableUuid = default;
             Option<List<string>> notrequiredNullableArrayOfString = default;
             Option<bool?> notrequiredNullableBooleanProp = default;
             Option<DateTime?> notrequiredNullableDatetimeProp = default;
-            Option<RequiredClassRequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
-            Option<RequiredClassRequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
-            Option<RequiredClassRequiredNullableEnumString?> notrequiredNullableEnumString = default;
+            Option<RequiredClassNotrequiredNullableEnumInteger?> notrequiredNullableEnumInteger = default;
+            Option<RequiredClassNotrequiredNullableEnumIntegerOnly?> notrequiredNullableEnumIntegerOnly = default;
+            Option<RequiredClassNotrequiredNullableEnumString?> notrequiredNullableEnumString = default;
             Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default;
             Option<string> notrequiredNullableStringProp = default;
             Option<Guid?> notrequiredNullableUuid = default;
@@ -811,17 +811,17 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                         case "notrequired_notnullable_enum_integer":
                             string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerRawValue != null)
-                                notrequiredNotnullableEnumInteger = new Option<RequiredClassRequiredNotnullableEnumInteger?>(RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
+                                notrequiredNotnullableEnumInteger = new Option<RequiredClassNotrequiredNotnullableEnumInteger?>(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue));
                             break;
                         case "notrequired_notnullable_enum_integer_only":
                             string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumIntegerOnlyRawValue != null)
-                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassRequiredNotnullableEnumIntegerOnly?>(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
+                                notrequiredNotnullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_notnullable_enum_string":
                             string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString();
                             if (notrequiredNotnullableEnumStringRawValue != null)
-                                notrequiredNotnullableEnumString = new Option<RequiredClassRequiredNotnullableEnumString?>(RequiredClassRequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
+                                notrequiredNotnullableEnumString = new Option<RequiredClassNotrequiredNotnullableEnumString?>(RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(notrequiredNotnullableEnumStringRawValue));
                             break;
                         case "notrequired_notnullable_outerEnumDefaultValue":
                             string notrequiredNotnullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -845,15 +845,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "notrequired_nullable_enum_integer":
                             string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumInteger = new Option<RequiredClassRequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
+                            notrequiredNullableEnumInteger = new Option<RequiredClassNotrequiredNullableEnumInteger?>(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue));
                             break;
                         case "notrequired_nullable_enum_integer_only":
                             string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassRequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
+                            notrequiredNullableEnumIntegerOnly = new Option<RequiredClassNotrequiredNullableEnumIntegerOnly?>(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue));
                             break;
                         case "notrequired_nullable_enum_string":
                             string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString();
-                            notrequiredNullableEnumString = new Option<RequiredClassRequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
+                            notrequiredNullableEnumString = new Option<RequiredClassNotrequiredNullableEnumString?>(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue));
                             break;
                         case "notrequired_nullable_outerEnumDefaultValue":
                             string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString();
@@ -1136,17 +1136,17 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
 
             if (requiredClass.NotrequiredNotnullableEnumIntegerOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
+                var notrequiredNotnullableEnumIntegerRawValue = RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumInteger.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer", notrequiredNotnullableEnumIntegerRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumIntegerOnlyOption.IsSet)
             {
-                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
+                var notrequiredNotnullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumIntegerOnly.Value);
                 writer.WriteNumber("notrequired_notnullable_enum_integer_only", notrequiredNotnullableEnumIntegerOnlyRawValue);
             }
             if (requiredClass.NotrequiredNotnullableEnumStringOption.IsSet)
             {
-                var notrequiredNotnullableEnumStringRawValue = RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
+                var notrequiredNotnullableEnumStringRawValue = RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNotnullableEnumString.Value);
                 writer.WriteString("notrequired_notnullable_enum_string", notrequiredNotnullableEnumStringRawValue);
             }
             if (requiredClass.NotrequiredNotnullableOuterEnumDefaultValueOption.IsSet)
@@ -1183,7 +1183,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerRawValue = RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
+                    var notrequiredNullableEnumIntegerRawValue = RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer", notrequiredNullableEnumIntegerRawValue);
                 }
                 else
@@ -1191,7 +1191,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value != null)
                 {
-                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
+                    var notrequiredNullableEnumIntegerOnlyRawValue = RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumIntegerOnlyOption.Value.Value);
                     writer.WriteNumber("notrequired_nullable_enum_integer_only", notrequiredNullableEnumIntegerOnlyRawValue);
                 }
                 else
@@ -1199,7 +1199,7 @@ public void WriteProperties(Utf8JsonWriter writer, RequiredClass requiredClass,
             if (requiredClass.NotrequiredNullableEnumStringOption.IsSet)
                 if (requiredClass.NotrequiredNullableEnumStringOption.Value != null)
                 {
-                    var notrequiredNullableEnumStringRawValue = RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
+                    var notrequiredNullableEnumStringRawValue = RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClass.NotrequiredNullableEnumStringOption.Value.Value);
                     writer.WriteString("notrequired_nullable_enum_string", notrequiredNullableEnumStringRawValue);
                 }
                 else
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
new file mode 100644
index 000000000000..03c6331d3658
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumInteger? requiredClassNotrequiredNotnullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumInteger.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..c8e2c8d8619c
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNotnullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNotnullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumIntegerOnly? requiredClassNotrequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
new file mode 100644
index 000000000000..99c807384c10
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNotnullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_notnullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNotnullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNotnullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNotnullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNotnullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNotnullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNotnullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNotnullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNotnullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNotnullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNotnullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNotnullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNotnullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNotnullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNotnullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNotnullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNotnullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNotnullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNotnullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNotnullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNotnullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNotnullableEnumString? requiredClassNotrequiredNotnullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNotnullableEnumString.HasValue ? RequiredClassNotrequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNotnullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
new file mode 100644
index 000000000000..73e23e577c36
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumInteger.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumInteger
+    {
+        /// <summary>
+        /// Enum NUMBER_1 for value: 1
+        /// </summary>
+        NUMBER_1 = 1,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_1 for value: -1
+        /// </summary>
+        NUMBER_MINUS_1 = -1
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger FromString(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumInteger: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumInteger? FromStringOrDefault(string value)
+        {
+            if (value.Equals((1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_1;
+
+            if (value.Equals((-1).ToString()))
+                return RequiredClassNotrequiredNullableEnumInteger.NUMBER_MINUS_1;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumInteger"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumInteger value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumInteger"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumInteger?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumInteger from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumInteger? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumInteger to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumInteger"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumInteger? requiredClassNotrequiredNullableEnumInteger, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumInteger.HasValue ? RequiredClassNotrequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumInteger.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
new file mode 100644
index 000000000000..703154711431
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumIntegerOnly.cs
@@ -0,0 +1,168 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_integer_only
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumIntegerOnly
+    {
+        /// <summary>
+        /// Enum NUMBER_2 for value: 2
+        /// </summary>
+        NUMBER_2 = 2,
+
+        /// <summary>
+        /// Enum NUMBER_MINUS_2 for value: -2
+        /// </summary>
+        NUMBER_MINUS_2 = -2
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly FromString(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumIntegerOnly: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumIntegerOnly? FromStringOrDefault(string value)
+        {
+            if (value.Equals((2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_2;
+
+            if (value.Equals((-2).ToString()))
+                return RequiredClassNotrequiredNullableEnumIntegerOnly.NUMBER_MINUS_2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static int ToJsonValue(RequiredClassNotrequiredNullableEnumIntegerOnly value)
+        {
+            return (int) value;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumIntegerOnly"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumIntegerOnlyNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumIntegerOnly?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumIntegerOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumIntegerOnly? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumIntegerOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumIntegerOnly"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumIntegerOnly? requiredClassNotrequiredNullableEnumIntegerOnly, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumIntegerOnly.HasValue ? RequiredClassNotrequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumIntegerOnly.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
new file mode 100644
index 000000000000..b20fd9668c26
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassNotrequiredNullableEnumString.cs
@@ -0,0 +1,258 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines RequiredClass_notrequired_nullable_enum_string
+    /// </summary>
+    public enum RequiredClassNotrequiredNullableEnumString
+    {
+        /// <summary>
+        /// Enum UPPER for value: UPPER
+        /// </summary>
+        UPPER = 1,
+
+        /// <summary>
+        /// Enum Lower for value: lower
+        /// </summary>
+        Lower = 2,
+
+        /// <summary>
+        /// Enum Empty for value: 
+        /// </summary>
+        Empty = 3,
+
+        /// <summary>
+        /// Enum ValuewithTab for value: Value\twith tab
+        /// </summary>
+        ValuewithTab = 4,
+
+        /// <summary>
+        /// Enum ValueWithQuote for value: Value with \&quot; quote
+        /// </summary>
+        ValueWithQuote = 5,
+
+        /// <summary>
+        /// Enum ValueWithEscapedQuote for value: Value with escaped \&quot; quote
+        /// </summary>
+        ValueWithEscapedQuote = 6,
+
+        /// <summary>
+        /// Enum Duplicatevalue for value: Duplicate\nvalue
+        /// </summary>
+        Duplicatevalue = 7,
+
+        /// <summary>
+        /// Enum Duplicatevalue2 for value: Duplicate\r\nvalue
+        /// </summary>
+        Duplicatevalue2 = 8
+    }
+
+    /// <summary>
+    /// Converts <see cref="RequiredClassNotrequiredNullableEnumString"/> to and from the JSON value
+    /// </summary>
+    public static class RequiredClassNotrequiredNullableEnumStringValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString FromString(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            throw new NotImplementedException($"Could not convert value to type RequiredClassNotrequiredNullableEnumString: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="RequiredClassNotrequiredNullableEnumString"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static RequiredClassNotrequiredNullableEnumString? FromStringOrDefault(string value)
+        {
+            if (value.Equals("UPPER"))
+                return RequiredClassNotrequiredNullableEnumString.UPPER;
+
+            if (value.Equals("lower"))
+                return RequiredClassNotrequiredNullableEnumString.Lower;
+
+            if (value.Equals(""))
+                return RequiredClassNotrequiredNullableEnumString.Empty;
+
+            if (value.Equals("Value\twith tab"))
+                return RequiredClassNotrequiredNullableEnumString.ValuewithTab;
+
+            if (value.Equals("Value with \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithQuote;
+
+            if (value.Equals("Value with escaped \" quote"))
+                return RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote;
+
+            if (value.Equals("Duplicate\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue;
+
+            if (value.Equals("Duplicate\r\nvalue"))
+                return RequiredClassNotrequiredNullableEnumString.Duplicatevalue2;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="RequiredClassNotrequiredNullableEnumString"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(RequiredClassNotrequiredNullableEnumString value)
+        {
+            if (value == RequiredClassNotrequiredNullableEnumString.UPPER)
+                return "UPPER";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Lower)
+                return "lower";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Empty)
+                return "";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValuewithTab)
+                return "Value\twith tab";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithQuote)
+                return "Value with \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.ValueWithEscapedQuote)
+                return "Value with escaped \" quote";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue)
+                return "Duplicate\nvalue";
+
+            if (value == RequiredClassNotrequiredNullableEnumString.Duplicatevalue2)
+                return "Duplicate\r\nvalue";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class RequiredClassNotrequiredNullableEnumStringJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="RequiredClassNotrequiredNullableEnumString"/>
+    /// </summary>
+    public class RequiredClassNotrequiredNullableEnumStringNullableJsonConverter : JsonConverter<RequiredClassNotrequiredNullableEnumString?>
+    {
+        /// <summary>
+        /// Returns a RequiredClassNotrequiredNullableEnumString from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override RequiredClassNotrequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            RequiredClassNotrequiredNullableEnumString? result = rawValue == null
+                ? null
+                : RequiredClassNotrequiredNullableEnumStringValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the RequiredClassNotrequiredNullableEnumString to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="requiredClassNotrequiredNullableEnumString"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, RequiredClassNotrequiredNullableEnumString? requiredClassNotrequiredNullableEnumString, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(requiredClassNotrequiredNullableEnumString.HasValue ? RequiredClassNotrequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassNotrequiredNullableEnumString.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
new file mode 100644
index 000000000000..19c0f7913257
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumHeaderStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringArrayParameterInner? testEnumParametersEnumHeaderStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringArrayParameterInner.HasValue ? TestEnumParametersEnumHeaderStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
new file mode 100644
index 000000000000..4fe8d2deb709
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_header_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumHeaderStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumHeaderStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumHeaderStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumHeaderStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumHeaderStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumHeaderStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumHeaderStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumHeaderStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumHeaderStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumHeaderStringParameter value)
+        {
+            if (value == TestEnumParametersEnumHeaderStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumHeaderStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumHeaderStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumHeaderStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumHeaderStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumHeaderStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumHeaderStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumHeaderStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumHeaderStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumHeaderStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
new file mode 100644
index 000000000000..8987ec0636e6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringArrayParameterInner.cs
@@ -0,0 +1,174 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_array_parameter_inner
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringArrayParameterInner
+    {
+        /// <summary>
+        /// Enum GreaterThan for value: &gt;
+        /// </summary>
+        GreaterThan = 1,
+
+        /// <summary>
+        /// Enum Dollar for value: $
+        /// </summary>
+        Dollar = 2
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner FromString(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringArrayParameterInner: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringArrayParameterInner? FromStringOrDefault(string value)
+        {
+            if (value.Equals(">"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan;
+
+            if (value.Equals("$"))
+                return TestEnumParametersEnumQueryStringArrayParameterInner.Dollar;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringArrayParameterInner value)
+        {
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.GreaterThan)
+                return ">";
+
+            if (value == TestEnumParametersEnumQueryStringArrayParameterInner.Dollar)
+                return "$";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringArrayParameterInner"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringArrayParameterInnerNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringArrayParameterInner?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringArrayParameterInner from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringArrayParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringArrayParameterInner? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringArrayParameterInner to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringArrayParameterInner"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringArrayParameterInner? testEnumParametersEnumQueryStringArrayParameterInner, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringArrayParameterInner.HasValue ? TestEnumParametersEnumQueryStringArrayParameterInnerValueConverter.ToJsonValue(testEnumParametersEnumQueryStringArrayParameterInner.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
new file mode 100644
index 000000000000..3adbbcc0c4c6
--- /dev/null
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryStringParameter.cs
@@ -0,0 +1,188 @@
+// <auto-generated>
+/*
+ * 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 System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// Defines testEnumParameters_enum_query_string_parameter
+    /// </summary>
+    public enum TestEnumParametersEnumQueryStringParameter
+    {
+        /// <summary>
+        /// Enum Abc for value: _abc
+        /// </summary>
+        Abc = 1,
+
+        /// <summary>
+        /// Enum Efg for value: -efg
+        /// </summary>
+        Efg = 2,
+
+        /// <summary>
+        /// Enum Xyz for value: (xyz)
+        /// </summary>
+        Xyz = 3
+    }
+
+    /// <summary>
+    /// Converts <see cref="TestEnumParametersEnumQueryStringParameter"/> to and from the JSON value
+    /// </summary>
+    public static class TestEnumParametersEnumQueryStringParameterValueConverter
+    {
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter FromString(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            throw new NotImplementedException($"Could not convert value to type TestEnumParametersEnumQueryStringParameter: '{value}'");
+        }
+
+        /// <summary>
+        /// Parses a given value to <see cref="TestEnumParametersEnumQueryStringParameter"/>
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static TestEnumParametersEnumQueryStringParameter? FromStringOrDefault(string value)
+        {
+            if (value.Equals("_abc"))
+                return TestEnumParametersEnumQueryStringParameter.Abc;
+
+            if (value.Equals("-efg"))
+                return TestEnumParametersEnumQueryStringParameter.Efg;
+
+            if (value.Equals("(xyz)"))
+                return TestEnumParametersEnumQueryStringParameter.Xyz;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="TestEnumParametersEnumQueryStringParameter"/> to the json value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public static string ToJsonValue(TestEnumParametersEnumQueryStringParameter value)
+        {
+            if (value == TestEnumParametersEnumQueryStringParameter.Abc)
+                return "_abc";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Efg)
+                return "-efg";
+
+            if (value == TestEnumParametersEnumQueryStringParameter.Xyz)
+                return "(xyz)";
+
+            throw new NotImplementedException($"Value could not be handled: '{value}'");
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class TestEnumParametersEnumQueryStringParameterJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter>
+    {
+        /// <summary>
+        /// Returns a  from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter).ToString());
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="TestEnumParametersEnumQueryStringParameter"/>
+    /// </summary>
+    public class TestEnumParametersEnumQueryStringParameterNullableJsonConverter : JsonConverter<TestEnumParametersEnumQueryStringParameter?>
+    {
+        /// <summary>
+        /// Returns a TestEnumParametersEnumQueryStringParameter from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override TestEnumParametersEnumQueryStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string rawValue = reader.GetString();
+
+            TestEnumParametersEnumQueryStringParameter? result = rawValue == null
+                ? null
+                : TestEnumParametersEnumQueryStringParameterValueConverter.FromStringOrDefault(rawValue);
+
+            if (result != null)
+                return result.Value;
+
+            throw new JsonException();
+        }
+
+        /// <summary>
+        /// Writes the TestEnumParametersEnumQueryStringParameter to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="testEnumParametersEnumQueryStringParameter"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryStringParameter? testEnumParametersEnumQueryStringParameter, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(testEnumParametersEnumQueryStringParameter.HasValue ? TestEnumParametersEnumQueryStringParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryStringParameter.Value).ToString() : "null");
+        }
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index ec6b0d631c06..5635ac8f7dc1 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -1543,7 +1543,7 @@ components:
       content:
         multipart/form-data:
           schema:
-            $ref: "#/components/schemas/uploadFile_request"
+            $ref: "#/components/schemas/fake_upload_ref_request_bodies_request"
     UserArray:
       content:
         application/json:
@@ -3240,6 +3240,16 @@ components:
       required:
       - requiredFile
       type: object
+    fake_upload_ref_request_bodies_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+      type: object
     fake_ref_parameter_petId_parameter:
       oneOf:
       - type: string
diff --git a/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES b/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES
index 6d2323cbcd30..5a324456e0ba 100644
--- a/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES
+++ b/samples/client/petstore/ocaml-additional-properties/.openapi-generator/FILES
@@ -4,6 +4,7 @@ dune
 dune-project
 petstore_client.opam
 src/models/some_object.ml
+src/models/some_object_optional_field3_value.ml
 src/models/some_object_required_field3_value.ml
 src/support/enums.ml
 src/support/jsonSupport.ml
diff --git a/samples/client/petstore/ocaml-additional-properties/src/models/some_object.ml b/samples/client/petstore/ocaml-additional-properties/src/models/some_object.ml
index fe3c58d8c100..692d484eafe8 100644
--- a/samples/client/petstore/ocaml-additional-properties/src/models/some_object.ml
+++ b/samples/client/petstore/ocaml-additional-properties/src/models/some_object.ml
@@ -34,9 +34,9 @@
                  [@default []] [@to_yojson JsonSupport.of_map_of [%to_yojson: string]] [@of_yojson JsonSupport.to_map_of [%of_yojson: string]]
                 ; [@key "optional_field2"]
                     (** Optional, dictionary of strings *)
-                                      optional_field3: (string * Some_object_required_field3_value.t) list
+                                      optional_field3: (string * Some_object_optional_field3_value.t) list
                 
-                 [@default []] [@to_yojson JsonSupport.of_map_of [%to_yojson: Some_object_required_field3_value.t]] [@of_yojson JsonSupport.to_map_of [%of_yojson: Some_object_required_field3_value.t]]
+                 [@default []] [@to_yojson JsonSupport.of_map_of [%to_yojson: Some_object_optional_field3_value.t]] [@of_yojson JsonSupport.to_map_of [%of_yojson: Some_object_optional_field3_value.t]]
                 ; [@key "optional_field3"]
                     (** Optional, dictionary of objects *)
                 } [@@deriving yojson { strict = false }, show, eq ];;
diff --git a/samples/client/petstore/ocaml-additional-properties/src/models/some_object_optional_field3_value.ml b/samples/client/petstore/ocaml-additional-properties/src/models/some_object_optional_field3_value.ml
new file mode 100644
index 000000000000..298c6861909a
--- /dev/null
+++ b/samples/client/petstore/ocaml-additional-properties/src/models/some_object_optional_field3_value.ml
@@ -0,0 +1,31 @@
+(*
+ * This file has been generated by the OCamlClientCodegen generator for openapi-generator.
+ *
+ * Generated by: https://openapi-generator.tech
+ *
+ *)
+
+
+
+    
+        type t = {
+                              sub_field1: float
+                  
+                   option [@default None]
+                
+                
+                ; [@key "sub_field1"]
+                                              sub_field2: bool
+                  
+                   option [@default None]
+                
+                
+                ; [@key "sub_field2"]
+                        } [@@deriving yojson { strict = false }, show, eq ];;
+        
+        let create () : t = {
+            sub_field1 = None;
+            sub_field2 = None;
+        }
+    
+
diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/FILES b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/FILES
index acbe66995bdd..590f58b4a8df 100644
--- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/FILES
@@ -31,6 +31,8 @@ docs/FakeClassnameTags123Api.md
 docs/File.md
 docs/FileSchemaTestClass.md
 docs/Foo.md
+docs/FooGet404Response.md
+docs/FooGet4XXResponse.md
 docs/FooGetDefaultResponse.md
 docs/FormatTest.md
 docs/Fruit.md
diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
index 610d8f24f2a9..63310d46a7bc 100644
--- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
+++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
@@ -166,6 +166,12 @@ export interface FileSchemaTestClass {
 export interface Foo {
     'bar'?: string;
 }
+export interface FooGet404Response {
+    'string'?: Foo;
+}
+export interface FooGet4XXResponse {
+    'string'?: Foo;
+}
 export interface FooGetDefaultResponse {
     'string'?: Foo;
 }
diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet404Response.md b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet404Response.md
new file mode 100644
index 000000000000..8ec738620bab
--- /dev/null
+++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet404Response.md
@@ -0,0 +1,20 @@
+# FooGet404Response
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**string** | [**Foo**](Foo.md) |  | [optional] [default to undefined]
+
+## Example
+
+```typescript
+import { FooGet404Response } from './api';
+
+const instance: FooGet404Response = {
+    string,
+};
+```
+
+[[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/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet4XXResponse.md b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet4XXResponse.md
new file mode 100644
index 000000000000..1ba475f3de46
--- /dev/null
+++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/docs/FooGet4XXResponse.md
@@ -0,0 +1,20 @@
+# FooGet4XXResponse
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**string** | [**Foo**](Foo.md) |  | [optional] [default to undefined]
+
+## Example
+
+```typescript
+import { FooGet4XXResponse } from './api';
+
+const instance: FooGet4XXResponse = {
+    string,
+};
+```
+
+[[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/typescript-fetch/builds/enum/.openapi-generator/FILES b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/FILES
index 1e2d4cb46bfc..d36289fe99b1 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/FILES
@@ -3,11 +3,15 @@ apis/index.ts
 docs/DefaultApi.md
 docs/EnumPatternObject.md
 docs/FakeEnumRequestGetInline200Response.md
+docs/FakeEnumRequestPostInline200Response.md
+docs/FakeEnumRequestPostInlineRequest.md
 docs/NumberEnum.md
 docs/StringEnum.md
 index.ts
 models/EnumPatternObject.ts
 models/FakeEnumRequestGetInline200Response.ts
+models/FakeEnumRequestPostInline200Response.ts
+models/FakeEnumRequestPostInlineRequest.ts
 models/NumberEnum.ts
 models/StringEnum.ts
 models/index.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts
index c0717a0c9b5d..3a02d477c0b7 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts
@@ -23,6 +23,16 @@ import {
     FakeEnumRequestGetInline200ResponseFromJSON,
     FakeEnumRequestGetInline200ResponseToJSON,
 } from '../models/FakeEnumRequestGetInline200Response';
+import {
+    type FakeEnumRequestPostInline200Response,
+    FakeEnumRequestPostInline200ResponseFromJSON,
+    FakeEnumRequestPostInline200ResponseToJSON,
+} from '../models/FakeEnumRequestPostInline200Response';
+import {
+    type FakeEnumRequestPostInlineRequest,
+    FakeEnumRequestPostInlineRequestFromJSON,
+    FakeEnumRequestPostInlineRequestToJSON,
+} from '../models/FakeEnumRequestPostInlineRequest';
 import {
     type NumberEnum,
     NumberEnumFromJSON,
@@ -48,8 +58,8 @@ export interface FakeEnumRequestGetRefRequest {
     nullableNumberEnum?: NumberEnum | null;
 }
 
-export interface FakeEnumRequestPostInlineRequest {
-    fakeEnumRequestGetInline200Response?: FakeEnumRequestGetInline200Response;
+export interface FakeEnumRequestPostInlineOperationRequest {
+    fakeEnumRequestPostInlineRequest?: FakeEnumRequestPostInlineRequest;
 }
 
 export interface FakeEnumRequestPostRefRequest {
@@ -166,7 +176,7 @@ export class DefaultApi extends runtime.BaseAPI {
     /**
      * Creates request options for fakeEnumRequestPostInline without sending the request
      */
-    async fakeEnumRequestPostInlineRequestOpts(requestParameters: FakeEnumRequestPostInlineRequest): Promise<runtime.RequestOpts> {
+    async fakeEnumRequestPostInlineRequestOpts(requestParameters: FakeEnumRequestPostInlineOperationRequest): Promise<runtime.RequestOpts> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -181,22 +191,22 @@ export class DefaultApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: FakeEnumRequestGetInline200ResponseToJSON(requestParameters['fakeEnumRequestGetInline200Response']),
+            body: FakeEnumRequestPostInlineRequestToJSON(requestParameters['fakeEnumRequestPostInlineRequest']),
         };
     }
 
     /**
      */
-    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FakeEnumRequestGetInline200Response>> {
+    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FakeEnumRequestPostInline200Response>> {
         const requestOptions = await this.fakeEnumRequestPostInlineRequestOpts(requestParameters);
         const response = await this.request(requestOptions, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => FakeEnumRequestGetInline200ResponseFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => FakeEnumRequestPostInline200ResponseFromJSON(jsonValue));
     }
 
     /**
      */
-    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FakeEnumRequestGetInline200Response> {
+    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FakeEnumRequestPostInline200Response> {
         const response = await this.fakeEnumRequestPostInlineRaw(requestParameters, initOverrides);
         return await response.value();
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/docs/DefaultApi.md b/samples/client/petstore/typescript-fetch/builds/enum/docs/DefaultApi.md
index 9650fa77bd97..a10a0b97b1a2 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/docs/DefaultApi.md
+++ b/samples/client/petstore/typescript-fetch/builds/enum/docs/DefaultApi.md
@@ -6,7 +6,7 @@ All URIs are relative to *http://localhost:3000*
 |------------- | ------------- | -------------|
 | [**fakeEnumRequestGetInline**](DefaultApi.md#fakeenumrequestgetinline) | **GET** /fake/enum-request-inline |  |
 | [**fakeEnumRequestGetRef**](DefaultApi.md#fakeenumrequestgetref) | **GET** /fake/enum-request-ref |  |
-| [**fakeEnumRequestPostInline**](DefaultApi.md#fakeenumrequestpostinline) | **POST** /fake/enum-request-inline |  |
+| [**fakeEnumRequestPostInline**](DefaultApi.md#fakeenumrequestpostinlineoperation) | **POST** /fake/enum-request-inline |  |
 | [**fakeEnumRequestPostRef**](DefaultApi.md#fakeenumrequestpostref) | **POST** /fake/enum-request-ref |  |
 
 
@@ -161,7 +161,7 @@ No authorization required
 
 ## fakeEnumRequestPostInline
 
-> FakeEnumRequestGetInline200Response fakeEnumRequestPostInline(fakeEnumRequestGetInline200Response)
+> FakeEnumRequestPostInline200Response fakeEnumRequestPostInline(fakeEnumRequestPostInlineRequest)
 
 
 
@@ -172,16 +172,16 @@ import {
   Configuration,
   DefaultApi,
 } from '';
-import type { FakeEnumRequestPostInlineRequest } from '';
+import type { FakeEnumRequestPostInlineOperationRequest } from '';
 
 async function example() {
   console.log("🚀 Testing  SDK...");
   const api = new DefaultApi();
 
   const body = {
-    // FakeEnumRequestGetInline200Response (optional)
-    fakeEnumRequestGetInline200Response: ...,
-  } satisfies FakeEnumRequestPostInlineRequest;
+    // FakeEnumRequestPostInlineRequest (optional)
+    fakeEnumRequestPostInlineRequest: ...,
+  } satisfies FakeEnumRequestPostInlineOperationRequest;
 
   try {
     const data = await api.fakeEnumRequestPostInline(body);
@@ -200,11 +200,11 @@ example().catch(console.error);
 
 | Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **fakeEnumRequestGetInline200Response** | [FakeEnumRequestGetInline200Response](FakeEnumRequestGetInline200Response.md) |  | [Optional] |
+| **fakeEnumRequestPostInlineRequest** | [FakeEnumRequestPostInlineRequest](FakeEnumRequestPostInlineRequest.md) |  | [Optional] |
 
 ### Return type
 
-[**FakeEnumRequestGetInline200Response**](FakeEnumRequestGetInline200Response.md)
+[**FakeEnumRequestPostInline200Response**](FakeEnumRequestPostInline200Response.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInline200Response.md b/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInline200Response.md
new file mode 100644
index 000000000000..2830c1b4c456
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInline200Response.md
@@ -0,0 +1,40 @@
+
+# FakeEnumRequestPostInline200Response
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`stringEnum` | string
+`nullableStringEnum` | string
+`numberEnum` | number
+`nullableNumberEnum` | number
+
+## Example
+
+```typescript
+import type { FakeEnumRequestPostInline200Response } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "stringEnum": null,
+  "nullableStringEnum": null,
+  "numberEnum": null,
+  "nullableNumberEnum": null,
+} satisfies FakeEnumRequestPostInline200Response
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as FakeEnumRequestPostInline200Response
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInlineRequest.md b/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInlineRequest.md
new file mode 100644
index 000000000000..6e1f9e04eeb4
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/enum/docs/FakeEnumRequestPostInlineRequest.md
@@ -0,0 +1,40 @@
+
+# FakeEnumRequestPostInlineRequest
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`stringEnum` | string
+`nullableStringEnum` | string
+`numberEnum` | number
+`nullableNumberEnum` | number
+
+## Example
+
+```typescript
+import type { FakeEnumRequestPostInlineRequest } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "stringEnum": null,
+  "nullableStringEnum": null,
+  "numberEnum": null,
+  "nullableNumberEnum": null,
+} satisfies FakeEnumRequestPostInlineRequest
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as FakeEnumRequestPostInlineRequest
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInline200Response.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInline200Response.ts
new file mode 100644
index 000000000000..aac3d567aaa4
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInline200Response.ts
@@ -0,0 +1,131 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface FakeEnumRequestPostInline200Response
+ */
+export interface FakeEnumRequestPostInline200Response {
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseStringEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    stringEnum?: FakeEnumRequestPostInline200ResponseStringEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNullableStringEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    nullableStringEnum?: FakeEnumRequestPostInline200ResponseNullableStringEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNumberEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    numberEnum?: FakeEnumRequestPostInline200ResponseNumberEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    nullableNumberEnum?: FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum;
+}
+
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInline200ResponseStringEnumEnum = {
+    One: 'one',
+    Two: 'two',
+    Three: 'three'
+} as const;
+export type FakeEnumRequestPostInline200ResponseStringEnumEnum = typeof FakeEnumRequestPostInline200ResponseStringEnumEnum[keyof typeof FakeEnumRequestPostInline200ResponseStringEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInline200ResponseNullableStringEnumEnum = {
+    One: 'one',
+    Two: 'two',
+    Three: 'three'
+} as const;
+export type FakeEnumRequestPostInline200ResponseNullableStringEnumEnum = typeof FakeEnumRequestPostInline200ResponseNullableStringEnumEnum[keyof typeof FakeEnumRequestPostInline200ResponseNullableStringEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInline200ResponseNumberEnumEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2,
+    NUMBER_3: 3
+} as const;
+export type FakeEnumRequestPostInline200ResponseNumberEnumEnum = typeof FakeEnumRequestPostInline200ResponseNumberEnumEnum[keyof typeof FakeEnumRequestPostInline200ResponseNumberEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2,
+    NUMBER_3: 3
+} as const;
+export type FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum = typeof FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum[keyof typeof FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum];
+
+
+/**
+ * Check if a given object implements the FakeEnumRequestPostInline200Response interface.
+ */
+export function instanceOfFakeEnumRequestPostInline200Response(value: object): value is FakeEnumRequestPostInline200Response {
+    return true;
+}
+
+export function FakeEnumRequestPostInline200ResponseFromJSON(json: any): FakeEnumRequestPostInline200Response {
+    return FakeEnumRequestPostInline200ResponseFromJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInline200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInline200Response {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'stringEnum': json['string-enum'] == null ? undefined : json['string-enum'],
+        'nullableStringEnum': json['nullable-string-enum'] == null ? undefined : json['nullable-string-enum'],
+        'numberEnum': json['number-enum'] == null ? undefined : json['number-enum'],
+        'nullableNumberEnum': json['nullable-number-enum'] == null ? undefined : json['nullable-number-enum'],
+    };
+}
+
+export function FakeEnumRequestPostInline200ResponseToJSON(json: any): FakeEnumRequestPostInline200Response {
+    return FakeEnumRequestPostInline200ResponseToJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInline200ResponseToJSONTyped(value?: FakeEnumRequestPostInline200Response | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'string-enum': value['stringEnum'],
+        'nullable-string-enum': value['nullableStringEnum'],
+        'number-enum': value['numberEnum'],
+        'nullable-number-enum': value['nullableNumberEnum'],
+    };
+}
+
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInlineRequest.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInlineRequest.ts
index ea6fee11aa78..2d2cbef7181f 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInlineRequest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInlineRequest.ts
@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+import { mapValues } from '../runtime';
 /**
  * 
  * @export
@@ -21,25 +21,25 @@ import { exists, mapValues } from '../runtime';
 export interface FakeEnumRequestPostInlineRequest {
     /**
      * 
-     * @type {string}
+     * @type {FakeEnumRequestPostInlineRequestStringEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     stringEnum?: FakeEnumRequestPostInlineRequestStringEnumEnum;
     /**
      * 
-     * @type {string}
+     * @type {FakeEnumRequestPostInlineRequestNullableStringEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     nullableStringEnum?: FakeEnumRequestPostInlineRequestNullableStringEnumEnum;
     /**
      * 
-     * @type {number}
+     * @type {FakeEnumRequestPostInlineRequestNumberEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     numberEnum?: FakeEnumRequestPostInlineRequestNumberEnumEnum;
     /**
      * 
-     * @type {number}
+     * @type {FakeEnumRequestPostInlineRequestNullableNumberEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     nullableNumberEnum?: FakeEnumRequestPostInlineRequestNullableNumberEnumEnum;
@@ -87,36 +87,45 @@ export const FakeEnumRequestPostInlineRequestNullableNumberEnumEnum = {
 export type FakeEnumRequestPostInlineRequestNullableNumberEnumEnum = typeof FakeEnumRequestPostInlineRequestNullableNumberEnumEnum[keyof typeof FakeEnumRequestPostInlineRequestNullableNumberEnumEnum];
 
 
+/**
+ * Check if a given object implements the FakeEnumRequestPostInlineRequest interface.
+ */
+export function instanceOfFakeEnumRequestPostInlineRequest(value: object): value is FakeEnumRequestPostInlineRequest {
+    return true;
+}
+
 export function FakeEnumRequestPostInlineRequestFromJSON(json: any): FakeEnumRequestPostInlineRequest {
     return FakeEnumRequestPostInlineRequestFromJSONTyped(json, false);
 }
 
 export function FakeEnumRequestPostInlineRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInlineRequest {
-    if ((json === undefined) || (json === null)) {
+    if (json == null) {
         return json;
     }
     return {
         
-        'stringEnum': !exists(json, 'string-enum') ? undefined : json['string-enum'],
-        'nullableStringEnum': !exists(json, 'nullable-string-enum') ? undefined : json['nullable-string-enum'],
-        'numberEnum': !exists(json, 'number-enum') ? undefined : json['number-enum'],
-        'nullableNumberEnum': !exists(json, 'nullable-number-enum') ? undefined : json['nullable-number-enum'],
+        'stringEnum': json['string-enum'] == null ? undefined : json['string-enum'],
+        'nullableStringEnum': json['nullable-string-enum'] == null ? undefined : json['nullable-string-enum'],
+        'numberEnum': json['number-enum'] == null ? undefined : json['number-enum'],
+        'nullableNumberEnum': json['nullable-number-enum'] == null ? undefined : json['nullable-number-enum'],
     };
 }
 
-export function FakeEnumRequestPostInlineRequestToJSON(value?: FakeEnumRequestPostInlineRequest | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+export function FakeEnumRequestPostInlineRequestToJSON(json: any): FakeEnumRequestPostInlineRequest {
+    return FakeEnumRequestPostInlineRequestToJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInlineRequestToJSONTyped(value?: FakeEnumRequestPostInlineRequest | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
     }
+
     return {
         
-        'string-enum': value.stringEnum,
-        'nullable-string-enum': value.nullableStringEnum,
-        'number-enum': value.numberEnum,
-        'nullable-number-enum': value.nullableNumberEnum,
+        'string-enum': value['stringEnum'],
+        'nullable-string-enum': value['nullableStringEnum'],
+        'number-enum': value['numberEnum'],
+        'nullable-number-enum': value['nullableNumberEnum'],
     };
 }
 
diff --git a/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts b/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts
index e63381001b68..2e4d5a4c154b 100644
--- a/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/enum/models/index.ts
@@ -2,5 +2,7 @@
 /* eslint-disable */
 export * from './EnumPatternObject';
 export * from './FakeEnumRequestGetInline200Response';
+export * from './FakeEnumRequestPostInline200Response';
+export * from './FakeEnumRequestPostInlineRequest';
 export * from './NumberEnum';
 export * from './StringEnum';
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/FILES b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/FILES
index 1e2d4cb46bfc..d36289fe99b1 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/FILES
@@ -3,11 +3,15 @@ apis/index.ts
 docs/DefaultApi.md
 docs/EnumPatternObject.md
 docs/FakeEnumRequestGetInline200Response.md
+docs/FakeEnumRequestPostInline200Response.md
+docs/FakeEnumRequestPostInlineRequest.md
 docs/NumberEnum.md
 docs/StringEnum.md
 index.ts
 models/EnumPatternObject.ts
 models/FakeEnumRequestGetInline200Response.ts
+models/FakeEnumRequestPostInline200Response.ts
+models/FakeEnumRequestPostInlineRequest.ts
 models/NumberEnum.ts
 models/StringEnum.ts
 models/index.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts
index a419cba4b8a8..932a87d0b329 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts
@@ -23,6 +23,16 @@ import {
     FakeEnumRequestGetInline200ResponseFromJSON,
     FakeEnumRequestGetInline200ResponseToJSON,
 } from '../models/FakeEnumRequestGetInline200Response';
+import {
+    type FakeEnumRequestPostInline200Response,
+    FakeEnumRequestPostInline200ResponseFromJSON,
+    FakeEnumRequestPostInline200ResponseToJSON,
+} from '../models/FakeEnumRequestPostInline200Response';
+import {
+    type FakeEnumRequestPostInlineRequest,
+    FakeEnumRequestPostInlineRequestFromJSON,
+    FakeEnumRequestPostInlineRequestToJSON,
+} from '../models/FakeEnumRequestPostInlineRequest';
 import {
     type NumberEnum,
     NumberEnumFromJSON,
@@ -48,8 +58,8 @@ export interface FakeEnumRequestGetRefRequest {
     nullableNumberEnum?: NumberEnum | null;
 }
 
-export interface FakeEnumRequestPostInlineRequest {
-    fakeEnumRequestGetInline200Response?: FakeEnumRequestGetInline200Response;
+export interface FakeEnumRequestPostInlineOperationRequest {
+    fakeEnumRequestPostInlineRequest?: FakeEnumRequestPostInlineRequest;
 }
 
 export interface FakeEnumRequestPostRefRequest {
@@ -166,7 +176,7 @@ export class DefaultApi extends runtime.BaseAPI {
     /**
      * Creates request options for fakeEnumRequestPostInline without sending the request
      */
-    async fakeEnumRequestPostInlineRequestOpts(requestParameters: FakeEnumRequestPostInlineRequest): Promise<runtime.RequestOpts> {
+    async fakeEnumRequestPostInlineRequestOpts(requestParameters: FakeEnumRequestPostInlineOperationRequest): Promise<runtime.RequestOpts> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -181,22 +191,22 @@ export class DefaultApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: FakeEnumRequestGetInline200ResponseToJSON(requestParameters['fakeEnumRequestGetInline200Response']),
+            body: FakeEnumRequestPostInlineRequestToJSON(requestParameters['fakeEnumRequestPostInlineRequest']),
         };
     }
 
     /**
      */
-    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FakeEnumRequestGetInline200Response>> {
+    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FakeEnumRequestPostInline200Response>> {
         const requestOptions = await this.fakeEnumRequestPostInlineRequestOpts(requestParameters);
         const response = await this.request(requestOptions, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => FakeEnumRequestGetInline200ResponseFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => FakeEnumRequestPostInline200ResponseFromJSON(jsonValue));
     }
 
     /**
      */
-    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FakeEnumRequestGetInline200Response> {
+    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FakeEnumRequestPostInline200Response> {
         const response = await this.fakeEnumRequestPostInlineRaw(requestParameters, initOverrides);
         return await response.value();
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/DefaultApi.md b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/DefaultApi.md
index 9650fa77bd97..a10a0b97b1a2 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/DefaultApi.md
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/DefaultApi.md
@@ -6,7 +6,7 @@ All URIs are relative to *http://localhost:3000*
 |------------- | ------------- | -------------|
 | [**fakeEnumRequestGetInline**](DefaultApi.md#fakeenumrequestgetinline) | **GET** /fake/enum-request-inline |  |
 | [**fakeEnumRequestGetRef**](DefaultApi.md#fakeenumrequestgetref) | **GET** /fake/enum-request-ref |  |
-| [**fakeEnumRequestPostInline**](DefaultApi.md#fakeenumrequestpostinline) | **POST** /fake/enum-request-inline |  |
+| [**fakeEnumRequestPostInline**](DefaultApi.md#fakeenumrequestpostinlineoperation) | **POST** /fake/enum-request-inline |  |
 | [**fakeEnumRequestPostRef**](DefaultApi.md#fakeenumrequestpostref) | **POST** /fake/enum-request-ref |  |
 
 
@@ -161,7 +161,7 @@ No authorization required
 
 ## fakeEnumRequestPostInline
 
-> FakeEnumRequestGetInline200Response fakeEnumRequestPostInline(fakeEnumRequestGetInline200Response)
+> FakeEnumRequestPostInline200Response fakeEnumRequestPostInline(fakeEnumRequestPostInlineRequest)
 
 
 
@@ -172,16 +172,16 @@ import {
   Configuration,
   DefaultApi,
 } from '';
-import type { FakeEnumRequestPostInlineRequest } from '';
+import type { FakeEnumRequestPostInlineOperationRequest } from '';
 
 async function example() {
   console.log("🚀 Testing  SDK...");
   const api = new DefaultApi();
 
   const body = {
-    // FakeEnumRequestGetInline200Response (optional)
-    fakeEnumRequestGetInline200Response: ...,
-  } satisfies FakeEnumRequestPostInlineRequest;
+    // FakeEnumRequestPostInlineRequest (optional)
+    fakeEnumRequestPostInlineRequest: ...,
+  } satisfies FakeEnumRequestPostInlineOperationRequest;
 
   try {
     const data = await api.fakeEnumRequestPostInline(body);
@@ -200,11 +200,11 @@ example().catch(console.error);
 
 | Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **fakeEnumRequestGetInline200Response** | [FakeEnumRequestGetInline200Response](FakeEnumRequestGetInline200Response.md) |  | [Optional] |
+| **fakeEnumRequestPostInlineRequest** | [FakeEnumRequestPostInlineRequest](FakeEnumRequestPostInlineRequest.md) |  | [Optional] |
 
 ### Return type
 
-[**FakeEnumRequestGetInline200Response**](FakeEnumRequestGetInline200Response.md)
+[**FakeEnumRequestPostInline200Response**](FakeEnumRequestPostInline200Response.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInline200Response.md b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInline200Response.md
new file mode 100644
index 000000000000..2830c1b4c456
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInline200Response.md
@@ -0,0 +1,40 @@
+
+# FakeEnumRequestPostInline200Response
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`stringEnum` | string
+`nullableStringEnum` | string
+`numberEnum` | number
+`nullableNumberEnum` | number
+
+## Example
+
+```typescript
+import type { FakeEnumRequestPostInline200Response } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "stringEnum": null,
+  "nullableStringEnum": null,
+  "numberEnum": null,
+  "nullableNumberEnum": null,
+} satisfies FakeEnumRequestPostInline200Response
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as FakeEnumRequestPostInline200Response
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInlineRequest.md b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInlineRequest.md
new file mode 100644
index 000000000000..6e1f9e04eeb4
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/docs/FakeEnumRequestPostInlineRequest.md
@@ -0,0 +1,40 @@
+
+# FakeEnumRequestPostInlineRequest
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`stringEnum` | string
+`nullableStringEnum` | string
+`numberEnum` | number
+`nullableNumberEnum` | number
+
+## Example
+
+```typescript
+import type { FakeEnumRequestPostInlineRequest } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "stringEnum": null,
+  "nullableStringEnum": null,
+  "numberEnum": null,
+  "nullableNumberEnum": null,
+} satisfies FakeEnumRequestPostInlineRequest
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as FakeEnumRequestPostInlineRequest
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInline200Response.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInline200Response.ts
new file mode 100644
index 000000000000..04b488bb6c0c
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInline200Response.ts
@@ -0,0 +1,127 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface FakeEnumRequestPostInline200Response
+ */
+export interface FakeEnumRequestPostInline200Response {
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseStringEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    stringEnum?: FakeEnumRequestPostInline200ResponseStringEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNullableStringEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    nullableStringEnum?: FakeEnumRequestPostInline200ResponseNullableStringEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNumberEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    numberEnum?: FakeEnumRequestPostInline200ResponseNumberEnumEnum;
+    /**
+     * 
+     * @type {FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum}
+     * @memberof FakeEnumRequestPostInline200Response
+     */
+    nullableNumberEnum?: FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum;
+}
+
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInline200ResponseStringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInline200ResponseNullableStringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInline200ResponseNumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInline200ResponseNullableNumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+
+
+/**
+ * Check if a given object implements the FakeEnumRequestPostInline200Response interface.
+ */
+export function instanceOfFakeEnumRequestPostInline200Response(value: object): value is FakeEnumRequestPostInline200Response {
+    return true;
+}
+
+export function FakeEnumRequestPostInline200ResponseFromJSON(json: any): FakeEnumRequestPostInline200Response {
+    return FakeEnumRequestPostInline200ResponseFromJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInline200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInline200Response {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'stringEnum': json['string-enum'] == null ? undefined : json['string-enum'],
+        'nullableStringEnum': json['nullable-string-enum'] == null ? undefined : json['nullable-string-enum'],
+        'numberEnum': json['number-enum'] == null ? undefined : json['number-enum'],
+        'nullableNumberEnum': json['nullable-number-enum'] == null ? undefined : json['nullable-number-enum'],
+    };
+}
+
+export function FakeEnumRequestPostInline200ResponseToJSON(json: any): FakeEnumRequestPostInline200Response {
+    return FakeEnumRequestPostInline200ResponseToJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInline200ResponseToJSONTyped(value?: FakeEnumRequestPostInline200Response | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'string-enum': value['stringEnum'],
+        'nullable-string-enum': value['nullableStringEnum'],
+        'number-enum': value['numberEnum'],
+        'nullable-number-enum': value['nullableNumberEnum'],
+    };
+}
+
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInlineRequest.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInlineRequest.ts
index c27671d88bf7..a7bedb9e74d5 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInlineRequest.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInlineRequest.ts
@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+import { mapValues } from '../runtime';
 /**
  * 
  * @export
@@ -21,25 +21,25 @@ import { exists, mapValues } from '../runtime';
 export interface FakeEnumRequestPostInlineRequest {
     /**
      * 
-     * @type {string}
+     * @type {FakeEnumRequestPostInlineRequestStringEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     stringEnum?: FakeEnumRequestPostInlineRequestStringEnumEnum;
     /**
      * 
-     * @type {string}
+     * @type {FakeEnumRequestPostInlineRequestNullableStringEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     nullableStringEnum?: FakeEnumRequestPostInlineRequestNullableStringEnumEnum;
     /**
      * 
-     * @type {number}
+     * @type {FakeEnumRequestPostInlineRequestNumberEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     numberEnum?: FakeEnumRequestPostInlineRequestNumberEnumEnum;
     /**
      * 
-     * @type {number}
+     * @type {FakeEnumRequestPostInlineRequestNullableNumberEnumEnum}
      * @memberof FakeEnumRequestPostInlineRequest
      */
     nullableNumberEnum?: FakeEnumRequestPostInlineRequestNullableNumberEnumEnum;
@@ -83,36 +83,45 @@ export enum FakeEnumRequestPostInlineRequestNullableNumberEnumEnum {
 }
 
 
+/**
+ * Check if a given object implements the FakeEnumRequestPostInlineRequest interface.
+ */
+export function instanceOfFakeEnumRequestPostInlineRequest(value: object): value is FakeEnumRequestPostInlineRequest {
+    return true;
+}
+
 export function FakeEnumRequestPostInlineRequestFromJSON(json: any): FakeEnumRequestPostInlineRequest {
     return FakeEnumRequestPostInlineRequestFromJSONTyped(json, false);
 }
 
 export function FakeEnumRequestPostInlineRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInlineRequest {
-    if ((json === undefined) || (json === null)) {
+    if (json == null) {
         return json;
     }
     return {
         
-        'stringEnum': !exists(json, 'string-enum') ? undefined : json['string-enum'],
-        'nullableStringEnum': !exists(json, 'nullable-string-enum') ? undefined : json['nullable-string-enum'],
-        'numberEnum': !exists(json, 'number-enum') ? undefined : json['number-enum'],
-        'nullableNumberEnum': !exists(json, 'nullable-number-enum') ? undefined : json['nullable-number-enum'],
+        'stringEnum': json['string-enum'] == null ? undefined : json['string-enum'],
+        'nullableStringEnum': json['nullable-string-enum'] == null ? undefined : json['nullable-string-enum'],
+        'numberEnum': json['number-enum'] == null ? undefined : json['number-enum'],
+        'nullableNumberEnum': json['nullable-number-enum'] == null ? undefined : json['nullable-number-enum'],
     };
 }
 
-export function FakeEnumRequestPostInlineRequestToJSON(value?: FakeEnumRequestPostInlineRequest | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+export function FakeEnumRequestPostInlineRequestToJSON(json: any): FakeEnumRequestPostInlineRequest {
+    return FakeEnumRequestPostInlineRequestToJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInlineRequestToJSONTyped(value?: FakeEnumRequestPostInlineRequest | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
     }
+
     return {
         
-        'string-enum': value.stringEnum,
-        'nullable-string-enum': value.nullableStringEnum,
-        'number-enum': value.numberEnum,
-        'nullable-number-enum': value.nullableNumberEnum,
+        'string-enum': value['stringEnum'],
+        'nullable-string-enum': value['nullableStringEnum'],
+        'number-enum': value['numberEnum'],
+        'nullable-number-enum': value['nullableNumberEnum'],
     };
 }
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/index.ts
index e63381001b68..2e4d5a4c154b 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/models/index.ts
@@ -2,5 +2,7 @@
 /* eslint-disable */
 export * from './EnumPatternObject';
 export * from './FakeEnumRequestGetInline200Response';
+export * from './FakeEnumRequestPostInline200Response';
+export * from './FakeEnumRequestPostInlineRequest';
 export * from './NumberEnum';
 export * from './StringEnum';
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 d99a0b27da10..e085a8e8e18a 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
@@ -47,6 +47,8 @@ docs/FilterAny.md
 docs/FilterTypeRange.md
 docs/FilterTypeRegex.md
 docs/Foo.md
+docs/FooGet404Response.md
+docs/FooGet4XXResponse.md
 docs/FooGetDefaultResponse.md
 docs/FormatTest.md
 docs/Fruit.md
@@ -97,6 +99,8 @@ git_push.sh
 go.mod
 go.sum
 model_200_response.go
+model__foo_get_404_response.go
+model__foo_get_4_xx_response.go
 model__foo_get_default_response.go
 model__special_model_name_.go
 model_additional_properties_class.go
diff --git a/samples/openapi3/client/petstore/go/go-petstore/README.md b/samples/openapi3/client/petstore/go/go-petstore/README.md
index 39476fcedb9d..f6abb090d919 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/README.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/README.md
@@ -154,6 +154,8 @@ Class | Method | HTTP request | Description
  - [FilterTypeRange](docs/FilterTypeRange.md)
  - [FilterTypeRegex](docs/FilterTypeRegex.md)
  - [Foo](docs/Foo.md)
+ - [FooGet404Response](docs/FooGet404Response.md)
+ - [FooGet4XXResponse](docs/FooGet4XXResponse.md)
  - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md)
  - [FormatTest](docs/FormatTest.md)
  - [Fruit](docs/Fruit.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 1785e5b472ee..74e4e9fe3ece 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -55,13 +55,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/_foo_get_default_response"
+                $ref: "#/components/schemas/_foo_get_4XX_response"
           description: client error
         "404":
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/_foo_get_default_response"
+                $ref: "#/components/schemas/_foo_get_404_response"
           description: not found
   /pet:
     post:
@@ -2349,6 +2349,30 @@ components:
         string:
           $ref: "#/components/schemas/Foo"
       type: object
+    _foo_get_4XX_response:
+      example:
+        string:
+          bar: bar
+          map:
+            key:
+            - 2000-01-23T04:56:07.000+00:00
+            - 2000-01-23T04:56:07.000+00:00
+      properties:
+        string:
+          $ref: "#/components/schemas/Foo"
+      type: object
+    _foo_get_404_response:
+      example:
+        string:
+          bar: bar
+          map:
+            key:
+            - 2000-01-23T04:56:07.000+00:00
+            - 2000-01-23T04:56:07.000+00:00
+      properties:
+        string:
+          $ref: "#/components/schemas/Foo"
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_default.go b/samples/openapi3/client/petstore/go/go-petstore/api_default.go
index b72de821f940..7b76738167a1 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_default.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_default.go
@@ -132,7 +132,7 @@ func (a *DefaultAPIService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
 			error: localVarHTTPResponse.Status,
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
-			var v FooGetDefaultResponse
+			var v FooGet404Response
 			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 			if err != nil {
 				newErr.error = err.Error()
@@ -143,7 +143,7 @@ func (a *DefaultAPIService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode >= 400 && localVarHTTPResponse.StatusCode < 500 {
-			var v FooGetDefaultResponse
+			var v FooGet4XXResponse
 			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 			if err != nil {
 				newErr.error = err.Error()
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FooGet404Response.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FooGet404Response.md
new file mode 100644
index 000000000000..fecbf5c91a4a
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FooGet404Response.md
@@ -0,0 +1,56 @@
+# FooGet404Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**String** | Pointer to [**Foo**](Foo.md) |  | [optional] 
+
+## Methods
+
+### NewFooGet404Response
+
+`func NewFooGet404Response() *FooGet404Response`
+
+NewFooGet404Response instantiates a new FooGet404Response 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
+
+### NewFooGet404ResponseWithDefaults
+
+`func NewFooGet404ResponseWithDefaults() *FooGet404Response`
+
+NewFooGet404ResponseWithDefaults instantiates a new FooGet404Response 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
+
+### GetString
+
+`func (o *FooGet404Response) GetString() Foo`
+
+GetString returns the String field if non-nil, zero value otherwise.
+
+### GetStringOk
+
+`func (o *FooGet404Response) GetStringOk() (*Foo, bool)`
+
+GetStringOk returns a tuple with the String field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetString
+
+`func (o *FooGet404Response) SetString(v Foo)`
+
+SetString sets String field to given value.
+
+### HasString
+
+`func (o *FooGet404Response) HasString() bool`
+
+HasString 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/FooGet4XXResponse.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FooGet4XXResponse.md
new file mode 100644
index 000000000000..f729ce3f0daa
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FooGet4XXResponse.md
@@ -0,0 +1,56 @@
+# FooGet4XXResponse
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**String** | Pointer to [**Foo**](Foo.md) |  | [optional] 
+
+## Methods
+
+### NewFooGet4XXResponse
+
+`func NewFooGet4XXResponse() *FooGet4XXResponse`
+
+NewFooGet4XXResponse instantiates a new FooGet4XXResponse 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
+
+### NewFooGet4XXResponseWithDefaults
+
+`func NewFooGet4XXResponseWithDefaults() *FooGet4XXResponse`
+
+NewFooGet4XXResponseWithDefaults instantiates a new FooGet4XXResponse 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
+
+### GetString
+
+`func (o *FooGet4XXResponse) GetString() Foo`
+
+GetString returns the String field if non-nil, zero value otherwise.
+
+### GetStringOk
+
+`func (o *FooGet4XXResponse) GetStringOk() (*Foo, bool)`
+
+GetStringOk returns a tuple with the String field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetString
+
+`func (o *FooGet4XXResponse) SetString(v Foo)`
+
+SetString sets String field to given value.
+
+### HasString
+
+`func (o *FooGet4XXResponse) HasString() bool`
+
+HasString 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__foo_get_404_response.go b/samples/openapi3/client/petstore/go/go-petstore/model__foo_get_404_response.go
new file mode 100644
index 000000000000..f24cc1946796
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model__foo_get_404_response.go
@@ -0,0 +1,155 @@
+/*
+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"
+)
+
+// checks if the FooGet404Response type satisfies the MappedNullable interface at compile time
+var _ MappedNullable = &FooGet404Response{}
+
+// FooGet404Response struct for FooGet404Response
+type FooGet404Response struct {
+	String *Foo `json:"string,omitempty"`
+	AdditionalProperties map[string]interface{}
+}
+
+type _FooGet404Response FooGet404Response
+
+// NewFooGet404Response instantiates a new FooGet404Response 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 NewFooGet404Response() *FooGet404Response {
+	this := FooGet404Response{}
+	return &this
+}
+
+// NewFooGet404ResponseWithDefaults instantiates a new FooGet404Response 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 NewFooGet404ResponseWithDefaults() *FooGet404Response {
+	this := FooGet404Response{}
+	return &this
+}
+
+// GetString returns the String field value if set, zero value otherwise.
+func (o *FooGet404Response) GetString() Foo {
+	if o == nil || IsNil(o.String) {
+		var ret Foo
+		return ret
+	}
+	return *o.String
+}
+
+// GetStringOk returns a tuple with the String field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *FooGet404Response) GetStringOk() (*Foo, bool) {
+	if o == nil || IsNil(o.String) {
+		return nil, false
+	}
+	return o.String, true
+}
+
+// HasString returns a boolean if a field has been set.
+func (o *FooGet404Response) HasString() bool {
+	if o != nil && !IsNil(o.String) {
+		return true
+	}
+
+	return false
+}
+
+// SetString gets a reference to the given Foo and assigns it to the String field.
+func (o *FooGet404Response) SetString(v Foo) {
+	o.String = &v
+}
+
+func (o FooGet404Response) MarshalJSON() ([]byte, error) {
+	toSerialize,err := o.ToMap()
+	if err != nil {
+		return []byte{}, err
+	}
+	return json.Marshal(toSerialize)
+}
+
+func (o FooGet404Response) ToMap() (map[string]interface{}, error) {
+	toSerialize := map[string]interface{}{}
+	if !IsNil(o.String) {
+		toSerialize["string"] = o.String
+	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
+	return toSerialize, nil
+}
+
+func (o *FooGet404Response) UnmarshalJSON(data []byte) (err error) {
+	varFooGet404Response := _FooGet404Response{}
+
+	err = json.Unmarshal(data, &varFooGet404Response)
+
+	if err != nil {
+		return err
+	}
+
+	*o = FooGet404Response(varFooGet404Response)
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(data, &additionalProperties); err == nil {
+		delete(additionalProperties, "string")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
+type NullableFooGet404Response struct {
+	value *FooGet404Response
+	isSet bool
+}
+
+func (v NullableFooGet404Response) Get() *FooGet404Response {
+	return v.value
+}
+
+func (v *NullableFooGet404Response) Set(val *FooGet404Response) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableFooGet404Response) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableFooGet404Response) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableFooGet404Response(val *FooGet404Response) *NullableFooGet404Response {
+	return &NullableFooGet404Response{value: val, isSet: true}
+}
+
+func (v NullableFooGet404Response) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableFooGet404Response) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model__foo_get_4_xx_response.go b/samples/openapi3/client/petstore/go/go-petstore/model__foo_get_4_xx_response.go
new file mode 100644
index 000000000000..e789aeb369a6
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model__foo_get_4_xx_response.go
@@ -0,0 +1,155 @@
+/*
+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"
+)
+
+// checks if the FooGet4XXResponse type satisfies the MappedNullable interface at compile time
+var _ MappedNullable = &FooGet4XXResponse{}
+
+// FooGet4XXResponse struct for FooGet4XXResponse
+type FooGet4XXResponse struct {
+	String *Foo `json:"string,omitempty"`
+	AdditionalProperties map[string]interface{}
+}
+
+type _FooGet4XXResponse FooGet4XXResponse
+
+// NewFooGet4XXResponse instantiates a new FooGet4XXResponse 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 NewFooGet4XXResponse() *FooGet4XXResponse {
+	this := FooGet4XXResponse{}
+	return &this
+}
+
+// NewFooGet4XXResponseWithDefaults instantiates a new FooGet4XXResponse 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 NewFooGet4XXResponseWithDefaults() *FooGet4XXResponse {
+	this := FooGet4XXResponse{}
+	return &this
+}
+
+// GetString returns the String field value if set, zero value otherwise.
+func (o *FooGet4XXResponse) GetString() Foo {
+	if o == nil || IsNil(o.String) {
+		var ret Foo
+		return ret
+	}
+	return *o.String
+}
+
+// GetStringOk returns a tuple with the String field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *FooGet4XXResponse) GetStringOk() (*Foo, bool) {
+	if o == nil || IsNil(o.String) {
+		return nil, false
+	}
+	return o.String, true
+}
+
+// HasString returns a boolean if a field has been set.
+func (o *FooGet4XXResponse) HasString() bool {
+	if o != nil && !IsNil(o.String) {
+		return true
+	}
+
+	return false
+}
+
+// SetString gets a reference to the given Foo and assigns it to the String field.
+func (o *FooGet4XXResponse) SetString(v Foo) {
+	o.String = &v
+}
+
+func (o FooGet4XXResponse) MarshalJSON() ([]byte, error) {
+	toSerialize,err := o.ToMap()
+	if err != nil {
+		return []byte{}, err
+	}
+	return json.Marshal(toSerialize)
+}
+
+func (o FooGet4XXResponse) ToMap() (map[string]interface{}, error) {
+	toSerialize := map[string]interface{}{}
+	if !IsNil(o.String) {
+		toSerialize["string"] = o.String
+	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
+	return toSerialize, nil
+}
+
+func (o *FooGet4XXResponse) UnmarshalJSON(data []byte) (err error) {
+	varFooGet4XXResponse := _FooGet4XXResponse{}
+
+	err = json.Unmarshal(data, &varFooGet4XXResponse)
+
+	if err != nil {
+		return err
+	}
+
+	*o = FooGet4XXResponse(varFooGet4XXResponse)
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(data, &additionalProperties); err == nil {
+		delete(additionalProperties, "string")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
+type NullableFooGet4XXResponse struct {
+	value *FooGet4XXResponse
+	isSet bool
+}
+
+func (v NullableFooGet4XXResponse) Get() *FooGet4XXResponse {
+	return v.value
+}
+
+func (v *NullableFooGet4XXResponse) Set(val *FooGet4XXResponse) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableFooGet4XXResponse) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableFooGet4XXResponse) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableFooGet4XXResponse(val *FooGet4XXResponse) *NullableFooGet4XXResponse {
+	return &NullableFooGet4XXResponse{value: val, isSet: true}
+}
+
+func (v NullableFooGet4XXResponse) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableFooGet4XXResponse) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
diff --git a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
index c74579383333..1eb565d74f11 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-aiohttp/README.md b/samples/openapi3/client/petstore/python-aiohttp/README.md
index 0a4c55c4dabc..2a9004bb63e3 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/README.md
+++ b/samples/openapi3/client/petstore/python-aiohttp/README.md
@@ -261,6 +261,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
index a8b76b34b894..8f79394afc28 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
index 6a76c22cac03..c7f461775f59 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -284,6 +285,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
index 0d435906bfba..9e895f7806ee 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
@@ -32,6 +32,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9819,7 +9820,7 @@ def _test_string_map_reference_serialize(
     async def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9841,7 +9842,7 @@ async def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9894,7 +9895,7 @@ async def upload_file_with_additional_properties(
     async def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9916,7 +9917,7 @@ async def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9969,7 +9970,7 @@ async def upload_file_with_additional_properties_with_http_info(
     async def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9991,7 +9992,7 @@ async def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
index e498be0e1492..308e6dfc3ebb 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
@@ -123,6 +123,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
index c74579383333..1eb565d74f11 100644
--- a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-httpx/README.md b/samples/openapi3/client/petstore/python-httpx/README.md
index 0a4c55c4dabc..2a9004bb63e3 100644
--- a/samples/openapi3/client/petstore/python-httpx/README.md
+++ b/samples/openapi3/client/petstore/python-httpx/README.md
@@ -261,6 +261,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
index a8b76b34b894..8f79394afc28 100644
--- a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
index 6a76c22cac03..c7f461775f59 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -284,6 +285,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
index 0d435906bfba..9e895f7806ee 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
@@ -32,6 +32,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9819,7 +9820,7 @@ def _test_string_map_reference_serialize(
     async def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9841,7 +9842,7 @@ async def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9894,7 +9895,7 @@ async def upload_file_with_additional_properties(
     async def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9916,7 +9917,7 @@ async def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9969,7 +9970,7 @@ async def upload_file_with_additional_properties_with_http_info(
     async def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9991,7 +9992,7 @@ async def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
index e498be0e1492..308e6dfc3ebb 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
@@ -123,6 +123,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
index c74579383333..1eb565d74f11 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-lazyImports/README.md b/samples/openapi3/client/petstore/python-lazyImports/README.md
index 7c3e47704094..fa087510741c 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/README.md
+++ b/samples/openapi3/client/petstore/python-lazyImports/README.md
@@ -261,6 +261,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
index af0f050135b9..7ef2af8af2c3 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
index 2688f53428a9..64ad7b567d1a 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,6 +286,7 @@
     from petstore_api.models.type import Type as Type
     from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
     from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+    from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
     from petstore_api.models.user import User as User
     from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
     from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
@@ -430,6 +432,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
index e3f86661e566..2373d1680c58 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
@@ -32,6 +32,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9819,7 +9820,7 @@ def _test_string_map_reference_serialize(
     def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9841,7 +9842,7 @@ def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9894,7 +9895,7 @@ def upload_file_with_additional_properties(
     def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9916,7 +9917,7 @@ def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9969,7 +9970,7 @@ def upload_file_with_additional_properties_with_http_info(
     def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9991,7 +9992,7 @@ def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
index 34c087697749..9f052c816cb7 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
@@ -124,6 +124,7 @@
     from petstore_api.models.type import Type
     from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
     from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+    from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
     from petstore_api.models.user import User
     from petstore_api.models.uuid_with_pattern import UuidWithPattern
     from petstore_api.models.with_nested_one_of import WithNestedOneOf
@@ -245,6 +246,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
index a67a13c7dcba..3bdfdd3eebd9 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
index 557859f826b1..fca5f1d8c1bd 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
@@ -262,6 +262,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
index 39863affaa41..6aa84ef041f1 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
@@ -2503,7 +2503,7 @@ import time
 import os
 import petstore_api
 from petstore_api.models.api_response import ApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2519,7 +2519,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytearray | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2538,7 +2538,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytearray**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
index a6156ac008c3..e89049d66426 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -284,6 +285,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
index fea013dec496..7ee53259a5b9 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
@@ -38,6 +38,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient
@@ -4665,7 +4666,7 @@ async def test_string_map_reference_with_http_info(self, request_body : Annotate
             _request_auth=_params.get('_request_auth'))
 
     @validate_arguments
-    async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -4673,7 +4674,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request.
@@ -4692,7 +4693,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St
         return await self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs)  # noqa: E501
 
     @validate_arguments
-    async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -4700,7 +4701,7 @@ async def upload_file_with_additional_properties_with_http_info(self, file : Ann
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _preload_content: if False, the ApiResponse.data will
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
index 2ddd11a01de7..51cf981e4b26 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
@@ -124,6 +124,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
index a67a13c7dcba..3bdfdd3eebd9 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/README.md b/samples/openapi3/client/petstore/python-pydantic-v1/README.md
index cabc53d7d055..669b147f9082 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/README.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/README.md
@@ -262,6 +262,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
index 9a2efcfe2d57..6935c8587a23 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
@@ -2503,7 +2503,7 @@ import time
 import os
 import petstore_api
 from petstore_api.models.api_response import ApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2519,7 +2519,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytearray | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2538,7 +2538,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytearray**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
index a6156ac008c3..e89049d66426 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -284,6 +285,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
index e7796aa4c8d9..62ef06ed6b0e 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
@@ -37,6 +37,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient
@@ -5240,7 +5241,7 @@ def test_string_map_reference_with_http_info(self, request_body : Annotated[Dict
             _request_auth=_params.get('_request_auth'))
 
     @validate_arguments
-    def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -5253,7 +5254,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param async_req: Whether to execute the request asynchronously.
@@ -5274,7 +5275,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy
         return self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs)  # noqa: E501
 
     @validate_arguments
-    def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -5287,7 +5288,7 @@ def upload_file_with_additional_properties_with_http_info(self, file : Annotated
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param async_req: Whether to execute the request asynchronously.
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
index 2ddd11a01de7..51cf981e4b26 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
@@ -124,6 +124,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/FILES b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
index c74579383333..1eb565d74f11 100755
--- a/samples/openapi3/client/petstore/python/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
@@ -120,6 +120,7 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
+docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -250,6 +251,7 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
+petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md
index 7c3e47704094..fa087510741c 100755
--- a/samples/openapi3/client/petstore/python/README.md
+++ b/samples/openapi3/client/petstore/python/README.md
@@ -261,6 +261,7 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
+ - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md
index af0f050135b9..7ef2af8af2c3 100644
--- a/samples/openapi3/client/petstore/python/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
+    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
+ **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python/petstore_api/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/__init__.py
index 6a76c22cac03..c7f461775f59 100755
--- a/samples/openapi3/client/petstore/python/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/__init__.py
@@ -146,6 +146,7 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
+    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -284,6 +285,7 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
index e3f86661e566..2373d1680c58 100755
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
@@ -32,6 +32,7 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9819,7 +9820,7 @@ def _test_string_map_reference_serialize(
     def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9841,7 +9842,7 @@ def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9894,7 +9895,7 @@ def upload_file_with_additional_properties(
     def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9916,7 +9917,7 @@ def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9969,7 +9970,7 @@ def upload_file_with_additional_properties_with_http_info(
     def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
+        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9991,7 +9992,7 @@ def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: TestObjectForMultipartRequestsRequestMarker
+        :type object: UploadFileWithAdditionalPropertiesRequestObject
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
index e498be0e1492..308e6dfc3ebb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
@@ -123,6 +123,7 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
+from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/server/others/go-server/no-body-path-params/.openapi-generator/FILES b/samples/server/others/go-server/no-body-path-params/.openapi-generator/FILES
index a772660d829c..821f47610d07 100644
--- a/samples/server/others/go-server/no-body-path-params/.openapi-generator/FILES
+++ b/samples/server/others/go-server/no-body-path-params/.openapi-generator/FILES
@@ -16,5 +16,6 @@ go/helpers.go
 go/impl.go
 go/logger.go
 go/model_body_request.go
+go/model_both_request.go
 go/routers.go
 main.go
diff --git a/samples/server/others/go-server/no-body-path-params/api/openapi.yaml b/samples/server/others/go-server/no-body-path-params/api/openapi.yaml
index 465eac3525e9..7f423e65f3ab 100644
--- a/samples/server/others/go-server/no-body-path-params/api/openapi.yaml
+++ b/samples/server/others/go-server/no-body-path-params/api/openapi.yaml
@@ -69,7 +69,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/body_request"
+              $ref: "#/components/schemas/both_request"
           text/plain:
             schema:
               type: string
@@ -88,3 +88,8 @@ components:
         param:
           type: string
       type: object
+    both_request:
+      properties:
+        param:
+          type: string
+      type: object
diff --git a/samples/server/others/go-server/no-body-path-params/go/api.go b/samples/server/others/go-server/no-body-path-params/go/api.go
index c27ecc34176e..4544d45036d1 100644
--- a/samples/server/others/go-server/no-body-path-params/go/api.go
+++ b/samples/server/others/go-server/no-body-path-params/go/api.go
@@ -57,7 +57,7 @@ type BodyAPIServicer interface {
 // while the service implementation can be ignored with the .openapi-generator-ignore file
 // and updated with the logic required for the API.
 type BothAPIServicer interface { 
-	Both(context.Context, string, BodyRequest) (ImplResponse, error)
+	Both(context.Context, string, BothRequest) (ImplResponse, error)
 }
 
 
diff --git a/samples/server/others/go-server/no-body-path-params/go/api_both.go b/samples/server/others/go-server/no-body-path-params/go/api_both.go
index f32acf67c529..247cec9e1fca 100644
--- a/samples/server/others/go-server/no-body-path-params/go/api_both.go
+++ b/samples/server/others/go-server/no-body-path-params/go/api_both.go
@@ -82,22 +82,22 @@ func (c *BothAPIController) Both(w http.ResponseWriter, r *http.Request) {
 		c.errorHandler(w, r, &RequiredError{"pathParam"}, nil)
 		return
 	}
-	var bodyRequestParam BodyRequest
+	var bothRequestParam BothRequest
 	d := json.NewDecoder(r.Body)
 	d.DisallowUnknownFields()
-	if err := d.Decode(&bodyRequestParam); err != nil {
+	if err := d.Decode(&bothRequestParam); err != nil {
 		c.errorHandler(w, r, &ParsingError{Err: err}, nil)
 		return
 	}
-	if err := AssertBodyRequestRequired(bodyRequestParam); err != nil {
+	if err := AssertBothRequestRequired(bothRequestParam); err != nil {
 		c.errorHandler(w, r, err, nil)
 		return
 	}
-	if err := AssertBodyRequestConstraints(bodyRequestParam); err != nil {
+	if err := AssertBothRequestConstraints(bothRequestParam); err != nil {
 		c.errorHandler(w, r, err, nil)
 		return
 	}
-	result, err := c.service.Both(r.Context(), pathParamParam, bodyRequestParam)
+	result, err := c.service.Both(r.Context(), pathParamParam, bothRequestParam)
 	// If an error occurred, encode the error with the status code
 	if err != nil {
 		c.errorHandler(w, r, err, &result)
diff --git a/samples/server/others/go-server/no-body-path-params/go/api_both_service.go b/samples/server/others/go-server/no-body-path-params/go/api_both_service.go
index bb9b26a38628..ed27a13023e9 100644
--- a/samples/server/others/go-server/no-body-path-params/go/api_both_service.go
+++ b/samples/server/others/go-server/no-body-path-params/go/api_both_service.go
@@ -28,7 +28,7 @@ func NewBothAPIService() *BothAPIService {
 }
 
 // Both - summary
-func (s *BothAPIService) Both(ctx context.Context, pathParam string, bodyRequest BodyRequest) (ImplResponse, error) {
+func (s *BothAPIService) Both(ctx context.Context, pathParam string, bothRequest BothRequest) (ImplResponse, error) {
 	// TODO - update Both with the required logic for this service method.
 	// Add api_both_service.go to the .openapi-generator-ignore to avoid overwriting this service implementation when updating open api generation.
 
diff --git a/samples/server/others/go-server/no-body-path-params/go/model_both_request.go b/samples/server/others/go-server/no-body-path-params/go/model_both_request.go
new file mode 100644
index 000000000000..c46b6846dc85
--- /dev/null
+++ b/samples/server/others/go-server/no-body-path-params/go/model_both_request.go
@@ -0,0 +1,29 @@
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+/*
+ * Simple no path and body param spec
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * API version: 1.0.0
+ */
+
+package petstoreserver
+
+
+
+
+type BothRequest struct {
+
+	Param string `json:"param,omitempty"`
+}
+
+// AssertBothRequestRequired checks if the required fields are not zero-ed
+func AssertBothRequestRequired(obj BothRequest) error {
+	return nil
+}
+
+// AssertBothRequestConstraints checks if the values respects the defined constraints
+func AssertBothRequestConstraints(obj BothRequest) error {
+	return nil
+}
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 0c114f356abc..c96028965069 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -34,7 +34,9 @@ Model/EnumArraysJustSymbol.php
 Model/EnumClass.php
 Model/EnumTest.php
 Model/EnumTestEnumInteger.php
+Model/EnumTestEnumNumber.php
 Model/EnumTestEnumString.php
+Model/EnumTestEnumStringRequired.php
 Model/FakeBigDecimalMap200Response.php
 Model/File.php
 Model/FileSchemaTestClass.php
@@ -75,8 +77,12 @@ Model/ReadOnlyFirst.php
 Model/SingleRefType.php
 Model/SpecialModelName.php
 Model/Tag.php
+Model/TestEnumParametersEnumHeaderStringArrayParameterInner.php
+Model/TestEnumParametersEnumHeaderStringParameter.php
 Model/TestEnumParametersEnumQueryDoubleParameter.php
 Model/TestEnumParametersEnumQueryIntegerParameter.php
+Model/TestEnumParametersEnumQueryStringArrayParameterInner.php
+Model/TestEnumParametersEnumQueryStringParameter.php
 Model/TestEnumParametersRequestEnumFormString.php
 Model/TestEnumParametersRequestEnumFormStringArrayInner.php
 Model/TestInlineFreeformAdditionalPropertiesRequest.php
diff --git a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
index 6b8205fe19d2..920fed251df7 100644
--- a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
+++ b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
@@ -235,10 +235,10 @@ public function testEndpointParameters(
      * Operation testEnumParameters
      *
      * To test enum parameters
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumHeaderStringArray
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumQueryStringArray
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringArrayParameterInner[] $enumHeaderStringArray
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryStringArrayParameterInner[] $enumQueryStringArray
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryStringParameter $enumQueryString
      * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger
      * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble
      * @param null | \OpenAPI\Server\Model\EnumClass[] $enumQueryModelArray
@@ -248,9 +248,9 @@ public function testEndpointParameters(
      */
     public function testEnumParameters(
             ?array $enumHeaderStringArray,
-            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString,
+            ?\OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString,
             ?array $enumQueryStringArray,
-            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString,
+            ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryStringParameter $enumQueryString,
             ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger,
             ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble,
             ?array $enumQueryModelArray,
diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
index 6f2b2b1fe740..08655bcee898 100644
--- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
@@ -678,11 +678,11 @@ public function testEnumParameters(Request $request): JsonResponse
 
         $enumHeaderStringArray = $request->get('enumHeaderStringArray');
 
-        $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class);
+        $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter::class);
 
         $enumQueryStringArray = $request->get('enumQueryStringArray');
 
-        $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class);
+        $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumQueryStringParameter::class);
 
         $enumQueryInteger = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter::class);
 
diff --git a/samples/server/petstore/php-laravel/Model/EnumTest.php b/samples/server/petstore/php-laravel/Model/EnumTest.php
index 916cd6212800..8c04538a2235 100644
--- a/samples/server/petstore/php-laravel/Model/EnumTest.php
+++ b/samples/server/petstore/php-laravel/Model/EnumTest.php
@@ -38,13 +38,13 @@ class EnumTest
     * @param \OpenAPI\Server\Model\EnumTestEnumString $enumString
     *
     * 
-    * @param \OpenAPI\Server\Model\EnumTestEnumString $enumStringRequired
+    * @param \OpenAPI\Server\Model\EnumTestEnumStringRequired $enumStringRequired
     *
     * 
     * @param \OpenAPI\Server\Model\EnumTestEnumInteger $enumInteger
     *
     * 
-    * @param \OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumNumber
+    * @param \OpenAPI\Server\Model\EnumTestEnumNumber $enumNumber
     *
     * 
     * @param null | \OpenAPI\Server\Model\OuterEnum $outerEnum
@@ -61,9 +61,9 @@ class EnumTest
 
     public function __construct(
         public \OpenAPI\Server\Model\EnumTestEnumString $enumString,
-        public \OpenAPI\Server\Model\EnumTestEnumString $enumStringRequired,
+        public \OpenAPI\Server\Model\EnumTestEnumStringRequired $enumStringRequired,
         public \OpenAPI\Server\Model\EnumTestEnumInteger $enumInteger,
-        public \OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumNumber,
+        public \OpenAPI\Server\Model\EnumTestEnumNumber $enumNumber,
         public \OpenAPI\Server\Model\OuterEnumInteger $outerEnumInteger,
         public \OpenAPI\Server\Model\OuterEnumDefaultValue $outerEnumDefaultValue,
         public \OpenAPI\Server\Model\OuterEnumIntegerDefaultValue $outerEnumIntegerDefaultValue,
diff --git a/samples/server/petstore/php-laravel/Model/EnumTestEnumNumber.php b/samples/server/petstore/php-laravel/Model/EnumTestEnumNumber.php
new file mode 100644
index 000000000000..984c469485c7
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/EnumTestEnumNumber.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * 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: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * EnumTestEnumNumber
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * EnumTestEnumNumber
+ */
+enum EnumTestEnumNumber: float
+{
+        case NUMBER_1_DOT_1 = 1.1;
+        case MINUS_1_DOT_2 = -1.2;
+}
diff --git a/samples/server/petstore/php-laravel/Model/EnumTestEnumStringRequired.php b/samples/server/petstore/php-laravel/Model/EnumTestEnumStringRequired.php
new file mode 100644
index 000000000000..e012437df5a3
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/EnumTestEnumStringRequired.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+/**
+ * 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: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * EnumTestEnumStringRequired
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * EnumTestEnumStringRequired
+ */
+enum EnumTestEnumStringRequired: string
+{
+        case UPPER = 'UPPER';
+        case LOWER = 'lower';
+        case EMPTY = '';
+}
diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.php
new file mode 100644
index 000000000000..14fc6bfcbd66
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumHeaderStringArrayParameterInner.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * 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: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * TestEnumParametersEnumHeaderStringArrayParameterInner
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * TestEnumParametersEnumHeaderStringArrayParameterInner
+ */
+enum TestEnumParametersEnumHeaderStringArrayParameterInner: string
+{
+        case GREATER_THAN = '>';
+        case DOLLAR = '$';
+}
diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringArrayParameterInner.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringArrayParameterInner.php
new file mode 100644
index 000000000000..5b29974989a9
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringArrayParameterInner.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * 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: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * TestEnumParametersEnumQueryStringArrayParameterInner
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * TestEnumParametersEnumQueryStringArrayParameterInner
+ */
+enum TestEnumParametersEnumQueryStringArrayParameterInner: string
+{
+        case GREATER_THAN = '>';
+        case DOLLAR = '$';
+}
diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringParameter.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringParameter.php
new file mode 100644
index 000000000000..971d43af9f68
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersEnumQueryStringParameter.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+/**
+ * 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: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * TestEnumParametersEnumQueryStringParameter
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * TestEnumParametersEnumQueryStringParameter
+ */
+enum TestEnumParametersEnumQueryStringParameter: string
+{
+        case ABC = '_abc';
+        case EFG = '-efg';
+        case XYZ = '(xyz)';
+}
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/.openapi-generator/FILES b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/.openapi-generator/FILES
index 3f051cfa5e44..d231cf54b4e2 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/.openapi-generator/FILES
@@ -5,6 +5,7 @@ README.md
 api/openapi.yaml
 bin/cli.rs
 docs/MultipartRelatedRequest.md
+docs/MultipartRelatedRequestObjectField.md
 docs/MultipartRequestObjectField.md
 docs/MultipleIdenticalMimeTypesPostRequest.md
 docs/default_api.md
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
index 27b7d506c7eb..7b71c6b03a9a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/README.md
@@ -132,6 +132,7 @@ Method | HTTP request | Description
 ## Documentation For Models
 
  - [MultipartRelatedRequest](docs/MultipartRelatedRequest.md)
+ - [MultipartRelatedRequestObjectField](docs/MultipartRelatedRequestObjectField.md)
  - [MultipartRequestObjectField](docs/MultipartRequestObjectField.md)
  - [MultipleIdenticalMimeTypesPostRequest](docs/MultipleIdenticalMimeTypesPostRequest.md)
 
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/api/openapi.yaml
index 07e72037ff58..a98fe387a387 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/api/openapi.yaml
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/api/openapi.yaml
@@ -88,7 +88,7 @@ components:
     multipart_related_request:
       properties:
         object_field:
-          $ref: "#/components/schemas/multipart_request_object_field"
+          $ref: "#/components/schemas/multipart_related_request_object_field"
         optional_binary_field:
           format: binary
           type: string
@@ -118,4 +118,15 @@ components:
       required:
       - field_a
       type: object
+    multipart_related_request_object_field:
+      properties:
+        field_a:
+          type: string
+        field_b:
+          items:
+            type: string
+          type: array
+      required:
+      - field_a
+      type: object
 
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/bin/cli.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/bin/cli.rs
index cc14190181fb..9ee314804d49 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/bin/cli.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/bin/cli.rs
@@ -63,7 +63,7 @@ enum Operation {
         #[structopt(parse(try_from_str = parse_json))]
         required_binary_field: swagger::ByteArray,
         #[structopt(parse(try_from_str = parse_json))]
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         #[structopt(parse(try_from_str = parse_json))]
         optional_binary_field: Option<swagger::ByteArray>,
     },
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequest.md b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequest.md
index 0180168d1ec6..6e75a808a1e1 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequest.md
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**object_field** | [***models::MultipartRequestObjectField**](multipart_request_object_field.md) |  | [optional] [default to None]
+**object_field** | [***models::MultipartRelatedRequestObjectField**](multipart_related_request_object_field.md) |  | [optional] [default to None]
 **optional_binary_field** | [***swagger::ByteArray**](file.md) |  | [optional] [default to None]
 **required_binary_field** | [***swagger::ByteArray**](file.md) |  | 
 
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
new file mode 100644
index 000000000000..8936495eca1e
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
@@ -0,0 +1,11 @@
+# MultipartRelatedRequestObjectField
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**field_a** | **String** |  | 
+**field_b** | **Vec<String>** |  | [optional] [default to None]
+
+[[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/server/petstore/rust-server-deprecated/output/multipart-v3/docs/default_api.md b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/default_api.md
index 1e80b51a075c..9510718d3b0f 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/default_api.md
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/docs/default_api.md
@@ -26,7 +26,7 @@ Optional parameters are passed through a map[string]interface{}.
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **required_binary_field** | **swagger::ByteArray**|  | 
- **object_field** | [**multipart_request_object_field**](multipart_request_object_field.md)|  | 
+ **object_field** | [**multipart_related_request_object_field**](multipart_related_request_object_field.md)|  | 
  **optional_binary_field** | **swagger::ByteArray**|  | 
 
 ### Return type
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/examples/server/server.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/examples/server/server.rs
index af2ee7a36830..aac9c6e0963f 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/examples/server/server.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/examples/server/server.rs
@@ -116,7 +116,7 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/client/mod.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/client/mod.rs
index 0053b2b8d5bf..cf122cf74a65 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/client/mod.rs
@@ -392,7 +392,7 @@ impl<S, C> Api<C> for Client<S, C> where
     async fn multipart_related_request_post(
         &self,
         param_required_binary_field: swagger::ByteArray,
-        param_object_field: Option<models::MultipartRequestObjectField>,
+        param_object_field: Option<models::MultipartRelatedRequestObjectField>,
         param_optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/lib.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/lib.rs
index 8ce4c0f47af7..eda2fa1ff5a6 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/lib.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/lib.rs
@@ -44,7 +44,7 @@ pub trait Api<C: Send + Sync> {
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>;
 
@@ -76,7 +76,7 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         ) -> Result<MultipartRelatedRequestPostResponse, ApiError>;
 
@@ -122,7 +122,7 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         ) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/models.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/models.rs
index 3e1d69799de4..6400a10fef6d 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/models.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/models.rs
@@ -12,7 +12,7 @@ use crate::header;
 pub struct MultipartRelatedRequest {
     #[serde(rename = "object_field")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub object_field: Option<models::MultipartRequestObjectField>,
+    pub object_field: Option<models::MultipartRelatedRequestObjectField>,
 
     #[serde(rename = "optional_binary_field")]
     #[serde(skip_serializing_if="Option::is_none")]
@@ -61,7 +61,7 @@ impl std::str::FromStr for MultipartRelatedRequest {
         #[derive(Default)]
         #[allow(dead_code)]
         struct IntermediateRep {
-            pub object_field: Vec<models::MultipartRequestObjectField>,
+            pub object_field: Vec<models::MultipartRelatedRequestObjectField>,
             pub optional_binary_field: Vec<swagger::ByteArray>,
             pub required_binary_field: Vec<swagger::ByteArray>,
         }
@@ -82,7 +82,7 @@ impl std::str::FromStr for MultipartRelatedRequest {
                 #[allow(clippy::match_single_binding)]
                 match key {
                     #[allow(clippy::redundant_clone)]
-                    "object_field" => intermediate_rep.object_field.push(<models::MultipartRequestObjectField as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "object_field" => intermediate_rep.object_field.push(<models::MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     "optional_binary_field" => return std::result::Result::Err("Parsing binary data in this style is not supported in MultipartRelatedRequest".to_string()),
                     "required_binary_field" => return std::result::Result::Err("Parsing binary data in this style is not supported in MultipartRelatedRequest".to_string()),
                     _ => return std::result::Result::Err("Unexpected key while parsing MultipartRelatedRequest".to_string())
@@ -180,6 +180,176 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
     }
 }
 
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
+#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+pub struct MultipartRelatedRequestObjectField {
+    #[serde(rename = "field_a")]
+    pub field_a: String,
+
+    #[serde(rename = "field_b")]
+    #[serde(skip_serializing_if="Option::is_none")]
+    pub field_b: Option<Vec<String>>,
+
+}
+
+
+impl MultipartRelatedRequestObjectField {
+    #[allow(clippy::new_without_default)]
+    pub fn new(field_a: String, ) -> MultipartRelatedRequestObjectField {
+        MultipartRelatedRequestObjectField {
+            field_a,
+            field_b: None,
+        }
+    }
+}
+
+/// Converts the MultipartRelatedRequestObjectField value to the Query Parameters representation (style=form, explode=false)
+/// specified in https://swagger.io/docs/specification/serialization/
+/// Should be implemented in a serde serializer
+impl std::string::ToString for MultipartRelatedRequestObjectField {
+    fn to_string(&self) -> String {
+        let params: Vec<Option<String>> = vec![
+            Some("field_a".to_string()),
+            Some(self.field_a.to_string()),
+            self.field_b.as_ref().map(|field_b| {
+                [
+                    "field_b".to_string(),
+                    field_b.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(","),
+                ].join(",")
+            }),
+        ];
+
+        params.into_iter().flatten().collect::<Vec<_>>().join(",")
+    }
+}
+
+/// Converts Query Parameters representation (style=form, explode=false) to a MultipartRelatedRequestObjectField value
+/// as specified in https://swagger.io/docs/specification/serialization/
+/// Should be implemented in a serde deserializer
+impl std::str::FromStr for MultipartRelatedRequestObjectField {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        /// An intermediate representation of the struct to use for parsing.
+        #[derive(Default)]
+        #[allow(dead_code)]
+        struct IntermediateRep {
+            pub field_a: Vec<String>,
+            pub field_b: Vec<Vec<String>>,
+        }
+
+        let mut intermediate_rep = IntermediateRep::default();
+
+        // Parse into intermediate representation
+        let mut string_iter = s.split(',');
+        let mut key_result = string_iter.next();
+
+        while key_result.is_some() {
+            let val = match string_iter.next() {
+                Some(x) => x,
+                None => return std::result::Result::Err("Missing value while parsing MultipartRelatedRequestObjectField".to_string())
+            };
+
+            if let Some(key) = key_result {
+                #[allow(clippy::match_single_binding)]
+                match key {
+                    #[allow(clippy::redundant_clone)]
+                    "field_a" => intermediate_rep.field_a.push(<String as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "field_b" => return std::result::Result::Err("Parsing a container in this style is not supported in MultipartRelatedRequestObjectField".to_string()),
+                    _ => return std::result::Result::Err("Unexpected key while parsing MultipartRelatedRequestObjectField".to_string())
+                }
+            }
+
+            // Get the next key
+            key_result = string_iter.next();
+        }
+
+        // Use the intermediate representation to return the struct
+        std::result::Result::Ok(MultipartRelatedRequestObjectField {
+            field_a: intermediate_rep.field_a.into_iter().next().ok_or_else(|| "field_a missing in MultipartRelatedRequestObjectField".to_string())?,
+            field_b: intermediate_rep.field_b.into_iter().next(),
+        })
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<MultipartRelatedRequestObjectField> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<MultipartRelatedRequestObjectField>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<MultipartRelatedRequestObjectField>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for MultipartRelatedRequestObjectField - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<MultipartRelatedRequestObjectField> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into MultipartRelatedRequestObjectField - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<MultipartRelatedRequestObjectField> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into MultipartRelatedRequestObjectField - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct MultipartRequestObjectField {
diff --git a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/server/mod.rs b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/server/mod.rs
index 2cce5a4427b4..00208dcebb4c 100644
--- a/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/server/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/multipart-v3/src/server/mod.rs
@@ -228,15 +228,15 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                                             Some("application/json") if param_object_field.is_none() => {
                                                 // Extract JSON part.
                                                 let deserializer = &mut serde_json::Deserializer::from_slice(part.body.as_slice());
-                                                let json_data: models::MultipartRequestObjectField = match serde_ignored::deserialize(deserializer, |path| {
+                                                let json_data: models::MultipartRelatedRequestObjectField = match serde_ignored::deserialize(deserializer, |path| {
                                                     warn!("Ignoring unknown field in JSON part: {path}");
                                                     unused_elements.push(path.to_string());
                                                 }) {
                                                     Ok(json_data) => json_data,
                                                     Err(e) => return Ok(Response::builder()
                                                         .status(StatusCode::BAD_REQUEST)
-                                                        .body(Body::from(format!("Couldn't parse body parameter models::MultipartRequestObjectField - doesn't match schema: {e}")))
-                                                        .expect("Unable to create Bad Request response for invalid body parameter models::MultipartRequestObjectField due to schema"))
+                                                        .body(Body::from(format!("Couldn't parse body parameter models::MultipartRelatedRequestObjectField - doesn't match schema: {e}")))
+                                                        .expect("Unable to create Bad Request response for invalid body parameter models::MultipartRelatedRequestObjectField due to schema"))
                                                 };
                                                 // Push JSON part to return object.
                                                 param_object_field.get_or_insert(json_data);
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
index e899e0a0ceff..ffd4b514f4fd 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
@@ -11,6 +11,7 @@ docs/ApiResponse.md
 docs/ArrayOfArrayOfNumberOnly.md
 docs/ArrayOfNumberOnly.md
 docs/ArrayTest.md
+docs/ArrayTestArrayOfEnumInner.md
 docs/Capitalization.md
 docs/Cat.md
 docs/Category.md
@@ -25,13 +26,16 @@ docs/EnumArraysJustSymbol.md
 docs/EnumClass.md
 docs/EnumTest.md
 docs/EnumTestEnumInteger.md
+docs/EnumTestEnumNumber.md
 docs/EnumTestEnumString.md
+docs/EnumTestEnumStringRequired.md
 docs/FindPetsByStatusStatusParameterInner.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/List.md
 docs/MapTest.md
 docs/MapTestMapMapOfEnumValueValue.md
+docs/MapTestMapOfEnumStringValue.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
 docs/Name.md
@@ -51,8 +55,11 @@ docs/ReadOnlyFirst.md
 docs/Return.md
 docs/Tag.md
 docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/TestEnumParametersEnumHeaderStringParameter.md
 docs/TestEnumParametersEnumQueryDoubleParameter.md
 docs/TestEnumParametersEnumQueryIntegerParameter.md
+docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/TestEnumParametersEnumQueryStringParameter.md
 docs/TestEnumParametersRequestEnumFormString.md
 docs/User.md
 docs/another_fake_api.md
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
index d3c3afe2bb92..8ec97d27f34d 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -192,6 +192,7 @@ Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [ArrayTestArrayOfEnumInner](docs/ArrayTestArrayOfEnumInner.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
@@ -206,13 +207,16 @@ Method | HTTP request | Description
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
  - [EnumTestEnumInteger](docs/EnumTestEnumInteger.md)
+ - [EnumTestEnumNumber](docs/EnumTestEnumNumber.md)
  - [EnumTestEnumString](docs/EnumTestEnumString.md)
+ - [EnumTestEnumStringRequired](docs/EnumTestEnumStringRequired.md)
  - [FindPetsByStatusStatusParameterInner](docs/FindPetsByStatusStatusParameterInner.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [List](docs/List.md)
  - [MapTest](docs/MapTest.md)
  - [MapTestMapMapOfEnumValueValue](docs/MapTestMapMapOfEnumValueValue.md)
+ - [MapTestMapOfEnumStringValue](docs/MapTestMapOfEnumStringValue.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [Name](docs/Name.md)
@@ -232,8 +236,11 @@ Method | HTTP request | Description
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md)
+ - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
  - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
  - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
+ - [TestEnumParametersEnumQueryStringArrayParameterInner](docs/TestEnumParametersEnumQueryStringArrayParameterInner.md)
+ - [TestEnumParametersEnumQueryStringParameter](docs/TestEnumParametersEnumQueryStringParameter.md)
  - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
  - [User](docs/User.md)
 
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
index 2d1be7d9a6b8..2bc3ee819ba8 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -599,21 +599,21 @@ paths:
         in: header
         name: enum_header_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
       - description: Query parameter enum test (string array)
         explode: false
         in: query
         name: enum_query_string_array
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
         in: query
         name: enum_query_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_integer
@@ -1195,11 +1195,11 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
       required:
@@ -1302,7 +1302,7 @@ components:
           type: object
         map_of_enum_string:
           additionalProperties:
-            $ref: "#/components/schemas/MapTest_map_map_of_enum_value_value"
+            $ref: "#/components/schemas/MapTest_map_of_enum_string_value"
           type: object
       type: object
     ArrayTest:
@@ -1326,7 +1326,7 @@ components:
           type: array
         array_of_enum:
           items:
-            $ref: "#/components/schemas/MapTest_map_map_of_enum_value_value"
+            $ref: "#/components/schemas/ArrayTest_array_of_enum_inner"
           type: array
       type: object
     NumberOnly:
@@ -1437,6 +1437,26 @@ components:
       - '>'
       - $
       type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -1554,17 +1574,39 @@ components:
       - lower
       - ""
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
       - -1
       format: int32
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_map_of_enum_value_value:
       enum:
       - UPPER
       - lower
       type: string
+    MapTest_map_of_enum_string_value:
+      enum:
+      - UPPER
+      - lower
+      type: string
+    ArrayTest_array_of_enum_inner:
+      enum:
+      - UPPER
+      - lower
+      type: string
     EnumArrays_just_symbol:
       enum:
       - '>='
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
index bc8a5faa3599..0c07e2f7fea9 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
@@ -182,13 +182,13 @@ enum Operation {
         enum_header_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Header parameter enum test (string)
         #[structopt(parse(try_from_str = parse_json))]
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
         /// Query parameter enum test (string array)
         #[structopt(parse(try_from_str = parse_json), long)]
-        enum_query_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
+        enum_query_string_array: Option<Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
         /// Query parameter enum test (string)
         #[structopt(parse(try_from_str = parse_json))]
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         /// Query parameter enum test (double)
         #[structopt(parse(try_from_str = parse_json))]
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
index b563bd578c86..671ebb3c1a84 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **array_of_string** | **Vec<String>** |  | [optional] [default to None]
 **array_array_of_integer** | [**Vec<Vec<i64>>**](array.md) |  | [optional] [default to None]
 **array_array_of_model** | [**Vec<Vec<models::ReadOnlyFirst>>**](array.md) |  | [optional] [default to None]
-**array_of_enum** | [**Vec<models::MapTestMapMapOfEnumValueValue>**](MapTest_map_map_of_enum_value_value.md) |  | [optional] [default to None]
+**array_of_enum** | [**Vec<models::ArrayTestArrayOfEnumInner>**](ArrayTest_array_of_enum_inner.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
new file mode 100644
index 000000000000..dc52a2c6f275
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
@@ -0,0 +1,9 @@
+# ArrayTestArrayOfEnumInner
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
index cf89b12718d7..396ed88f428d 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_string** | [***models::EnumTestEnumString**](Enum_Test_enum_string.md) |  | [optional] [default to None]
-**enum_string_required** | [***models::EnumTestEnumString**](Enum_Test_enum_string.md) |  | 
+**enum_string_required** | [***models::EnumTestEnumStringRequired**](Enum_Test_enum_string_required.md) |  | 
 **enum_integer** | [***models::EnumTestEnumInteger**](Enum_Test_enum_integer.md) |  | [optional] [default to None]
-**enum_number** | [***models::TestEnumParametersEnumQueryDoubleParameter**](testEnumParameters_enum_query_double_parameter.md) |  | [optional] [default to None]
+**enum_number** | [***models::EnumTestEnumNumber**](Enum_Test_enum_number.md) |  | [optional] [default to None]
 **outer_enum** | [***models::OuterEnum**](OuterEnum.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..57d4328c01b4
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# EnumTestEnumNumber
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..a6a706ae35c9
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# EnumTestEnumStringRequired
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
index 590eae909b98..d134b82165ee 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **map_map_of_string** | [**std::collections::HashMap<String, std::collections::HashMap<String, String>>**](map.md) |  | [optional] [default to None]
 **map_map_of_enum** | [**std::collections::HashMap<String, std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>**](map.md) |  | [optional] [default to None]
-**map_of_enum_string** | [**std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>**](MapTest_map_map_of_enum_value_value.md) |  | [optional] [default to None]
+**map_of_enum_string** | [**std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>**](MapTest_map_of_enum_string_value.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
new file mode 100644
index 000000000000..118b189dea38
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
@@ -0,0 +1,9 @@
+# MapTestMapOfEnumStringValue
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..c7fa36ea83e7
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..a3d1b5bdf448
--- /dev/null
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# TestEnumParametersEnumQueryStringParameter
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
index 27c59de54b24..190fbfed565a 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
@@ -323,7 +323,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enum_header_string_array** | [**models::TestEnumParametersEnumHeaderStringArrayParameterInner**](models::TestEnumParametersEnumHeaderStringArrayParameterInner.md)| Header parameter enum test (string array) | 
  **enum_header_string** | [****](.md)| Header parameter enum test (string) | 
- **enum_query_string_array** | [**models::TestEnumParametersEnumHeaderStringArrayParameterInner**](models::TestEnumParametersEnumHeaderStringArrayParameterInner.md)| Query parameter enum test (string array) | 
+ **enum_query_string_array** | [**models::TestEnumParametersEnumQueryStringArrayParameterInner**](models::TestEnumParametersEnumQueryStringArrayParameterInner.md)| Query parameter enum test (string array) | 
  **enum_query_string** | [****](.md)| Query parameter enum test (string) | 
  **enum_query_integer** | [****](.md)| Query parameter enum test (double) | 
  **enum_query_double** | [****](.md)| Query parameter enum test (double) | 
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
index 31c2da85fe6f..7f42912d15f1 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
@@ -245,9 +245,9 @@ fn main() {
         Some("TestEnumParameters") => {
             let result = rt.block_on(client.test_enum_parameters(
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
+                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
+                  Some(models::TestEnumParametersEnumQueryStringParameter::Abc),
                   Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1),
                   Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11),
                   Some(models::TestEnumParametersRequestEnumFormString::Abc)
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
index a470efbe9af2..fcf831570219 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
@@ -244,9 +244,9 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index ad61a853d0ee..dc2207306886 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -1329,9 +1329,9 @@ impl<S, C> Api<C> for Client<S, C> where
     async fn test_enum_parameters(
         &self,
         param_enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        param_enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        param_enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        param_enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         param_enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         param_enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         param_enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
index 37da22cfbd68..74a04fa73e68 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
@@ -361,9 +361,9 @@ pub trait Api<C: Send + Sync> {
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -598,9 +598,9 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -889,9 +889,9 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index dde036648950..aaf2b8e5ae0e 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -1087,7 +1087,7 @@ pub struct ArrayTest {
 
     #[serde(rename = "array_of_enum")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub array_of_enum: Option<Vec<models::MapTestMapMapOfEnumValueValue>>,
+    pub array_of_enum: Option<Vec<models::ArrayTestArrayOfEnumInner>>,
 
 }
 
@@ -1139,7 +1139,7 @@ impl std::str::FromStr for ArrayTest {
             pub array_of_string: Vec<Vec<String>>,
             pub array_array_of_integer: Vec<Vec<Vec<i64>>>,
             pub array_array_of_model: Vec<Vec<Vec<models::ReadOnlyFirst>>>,
-            pub array_of_enum: Vec<Vec<models::MapTestMapMapOfEnumValueValue>>,
+            pub array_of_enum: Vec<Vec<models::ArrayTestArrayOfEnumInner>>,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -1266,6 +1266,128 @@ impl ArrayTest {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum ArrayTestArrayOfEnumInner {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+}
+
+impl std::fmt::Display for ArrayTestArrayOfEnumInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            ArrayTestArrayOfEnumInner::Upper => write!(f, "UPPER"),
+            ArrayTestArrayOfEnumInner::Lower => write!(f, "lower"),
+        }
+    }
+}
+
+impl std::str::FromStr for ArrayTestArrayOfEnumInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "UPPER" => std::result::Result::Ok(ArrayTestArrayOfEnumInner::Upper),
+            "lower" => std::result::Result::Ok(ArrayTestArrayOfEnumInner::Lower),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<ArrayTestArrayOfEnumInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<ArrayTestArrayOfEnumInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<ArrayTestArrayOfEnumInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for ArrayTestArrayOfEnumInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<ArrayTestArrayOfEnumInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <ArrayTestArrayOfEnumInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into ArrayTestArrayOfEnumInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<ArrayTestArrayOfEnumInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <ArrayTestArrayOfEnumInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into ArrayTestArrayOfEnumInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl ArrayTestArrayOfEnumInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct Capitalization {
@@ -3283,7 +3405,7 @@ pub struct EnumTest {
     pub enum_string: Option<models::EnumTestEnumString>,
 
     #[serde(rename = "enum_string_required")]
-    pub enum_string_required: models::EnumTestEnumString,
+    pub enum_string_required: models::EnumTestEnumStringRequired,
 
     #[serde(rename = "enum_integer")]
     #[serde(skip_serializing_if="Option::is_none")]
@@ -3291,7 +3413,7 @@ pub struct EnumTest {
 
     #[serde(rename = "enum_number")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub enum_number: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
+    pub enum_number: Option<models::EnumTestEnumNumber>,
 
     #[serde(rename = "outerEnum")]
     #[serde(skip_serializing_if="Option::is_none")]
@@ -3302,7 +3424,7 @@ pub struct EnumTest {
 
 impl EnumTest {
     #[allow(clippy::new_without_default)]
-    pub fn new(enum_string_required: models::EnumTestEnumString, ) -> EnumTest {
+    pub fn new(enum_string_required: models::EnumTestEnumStringRequired, ) -> EnumTest {
         EnumTest {
             enum_string: None,
             enum_string_required,
@@ -3342,9 +3464,9 @@ impl std::str::FromStr for EnumTest {
         #[allow(dead_code)]
         struct IntermediateRep {
             pub enum_string: Vec<models::EnumTestEnumString>,
-            pub enum_string_required: Vec<models::EnumTestEnumString>,
+            pub enum_string_required: Vec<models::EnumTestEnumStringRequired>,
             pub enum_integer: Vec<models::EnumTestEnumInteger>,
-            pub enum_number: Vec<models::TestEnumParametersEnumQueryDoubleParameter>,
+            pub enum_number: Vec<models::EnumTestEnumNumber>,
             pub outer_enum: Vec<models::OuterEnum>,
         }
 
@@ -3366,11 +3488,11 @@ impl std::str::FromStr for EnumTest {
                     #[allow(clippy::redundant_clone)]
                     "enum_string" => intermediate_rep.enum_string.push(<models::EnumTestEnumString as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
-                    "enum_string_required" => intermediate_rep.enum_string_required.push(<models::EnumTestEnumString as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "enum_string_required" => intermediate_rep.enum_string_required.push(<models::EnumTestEnumStringRequired as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
                     "enum_integer" => intermediate_rep.enum_integer.push(<models::EnumTestEnumInteger as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
-                    "enum_number" => intermediate_rep.enum_number.push(<models::TestEnumParametersEnumQueryDoubleParameter as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "enum_number" => intermediate_rep.enum_number.push(<models::EnumTestEnumNumber as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
                     "outerEnum" => intermediate_rep.outer_enum.push(<models::OuterEnum as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     _ => return std::result::Result::Err("Unexpected key while parsing EnumTest".to_string())
@@ -3601,6 +3723,128 @@ impl EnumTestEnumInteger {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum EnumTestEnumNumber {
+    #[serde(rename = "1.1")]
+    Variant11,
+    #[serde(rename = "-1.2")]
+    Variant12,
+}
+
+impl std::fmt::Display for EnumTestEnumNumber {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            EnumTestEnumNumber::Variant11 => write!(f, "1.1"),
+            EnumTestEnumNumber::Variant12 => write!(f, "-1.2"),
+        }
+    }
+}
+
+impl std::str::FromStr for EnumTestEnumNumber {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "1.1" => std::result::Result::Ok(EnumTestEnumNumber::Variant11),
+            "-1.2" => std::result::Result::Ok(EnumTestEnumNumber::Variant12),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<EnumTestEnumNumber> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<EnumTestEnumNumber>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<EnumTestEnumNumber>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for EnumTestEnumNumber - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<EnumTestEnumNumber> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <EnumTestEnumNumber as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into EnumTestEnumNumber - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<EnumTestEnumNumber>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<EnumTestEnumNumber>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<EnumTestEnumNumber>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<EnumTestEnumNumber> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <EnumTestEnumNumber as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into EnumTestEnumNumber - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl EnumTestEnumNumber {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
@@ -3734,65 +3978,65 @@ impl EnumTestEnumString {
 #[repr(C)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
 #[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum FindPetsByStatusStatusParameterInner {
-    #[serde(rename = "available")]
-    Available,
-    #[serde(rename = "pending")]
-    Pending,
-    #[serde(rename = "sold")]
-    Sold,
+pub enum EnumTestEnumStringRequired {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+    #[serde(rename = "")]
+    Empty,
 }
 
-impl std::fmt::Display for FindPetsByStatusStatusParameterInner {
+impl std::fmt::Display for EnumTestEnumStringRequired {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
-            FindPetsByStatusStatusParameterInner::Available => write!(f, "available"),
-            FindPetsByStatusStatusParameterInner::Pending => write!(f, "pending"),
-            FindPetsByStatusStatusParameterInner::Sold => write!(f, "sold"),
+            EnumTestEnumStringRequired::Upper => write!(f, "UPPER"),
+            EnumTestEnumStringRequired::Lower => write!(f, "lower"),
+            EnumTestEnumStringRequired::Empty => write!(f, ""),
         }
     }
 }
 
-impl std::str::FromStr for FindPetsByStatusStatusParameterInner {
+impl std::str::FromStr for EnumTestEnumStringRequired {
     type Err = String;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
         match s {
-            "available" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Available),
-            "pending" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Pending),
-            "sold" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Sold),
+            "UPPER" => std::result::Result::Ok(EnumTestEnumStringRequired::Upper),
+            "lower" => std::result::Result::Ok(EnumTestEnumStringRequired::Lower),
+            "" => std::result::Result::Ok(EnumTestEnumStringRequired::Empty),
             _ => std::result::Result::Err(format!("Value not valid: {s}")),
         }
     }
 }
 
-// Methods for converting between header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> and hyper::header::HeaderValue
+// Methods for converting between header::IntoHeaderValue<EnumTestEnumStringRequired> and hyper::header::HeaderValue
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>> for hyper::header::HeaderValue {
+impl std::convert::TryFrom<header::IntoHeaderValue<EnumTestEnumStringRequired>> for hyper::header::HeaderValue {
     type Error = String;
 
-    fn try_from(hdr_value: header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>) -> std::result::Result<Self, Self::Error> {
+    fn try_from(hdr_value: header::IntoHeaderValue<EnumTestEnumStringRequired>) -> std::result::Result<Self, Self::Error> {
         let hdr_value = hdr_value.to_string();
         match hyper::header::HeaderValue::from_str(&hdr_value) {
              std::result::Result::Ok(value) => std::result::Result::Ok(value),
              std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Invalid header value for FindPetsByStatusStatusParameterInner - value: {hdr_value} is invalid {e}"))
+                 format!("Invalid header value for EnumTestEnumStringRequired - value: {hdr_value} is invalid {e}"))
         }
     }
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> {
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<EnumTestEnumStringRequired> {
     type Error = String;
 
     fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
         match hdr_value.to_str() {
              std::result::Result::Ok(value) => {
-                    match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(value) {
+                    match <EnumTestEnumStringRequired as std::str::FromStr>::from_str(value) {
                         std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
                         std::result::Result::Err(err) => std::result::Result::Err(
-                            format!("Unable to convert header value '{value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                            format!("Unable to convert header value '{value}' into EnumTestEnumStringRequired - {err}"))
                     }
              },
              std::result::Result::Err(e) => std::result::Result::Err(
@@ -3802,10 +4046,10 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>> for hyper::header::HeaderValue {
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>>> for hyper::header::HeaderValue {
     type Error = String;
 
-    fn try_from(hdr_values: header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>) -> std::result::Result<Self, Self::Error> {
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>>) -> std::result::Result<Self, Self::Error> {
         let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
             hdr_value.to_string()
         }).collect();
@@ -3818,21 +4062,21 @@ impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusPar
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>> {
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>> {
     type Error = String;
 
     fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
         match hdr_values.to_str() {
             std::result::Result::Ok(hdr_values) => {
-                let hdr_values : std::vec::Vec<FindPetsByStatusStatusParameterInner> = hdr_values
+                let hdr_values : std::vec::Vec<EnumTestEnumStringRequired> = hdr_values
                 .split(',')
                 .filter_map(|hdr_value| match hdr_value.trim() {
                     "" => std::option::Option::None,
                     hdr_value => std::option::Option::Some({
-                        match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                        match <EnumTestEnumStringRequired as std::str::FromStr>::from_str(hdr_value) {
                             std::result::Result::Ok(value) => std::result::Result::Ok(value),
                             std::result::Result::Err(err) => std::result::Result::Err(
-                                format!("Unable to convert header value '{hdr_value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                                format!("Unable to convert header value '{hdr_value}' into EnumTestEnumStringRequired - {err}"))
                         }
                     })
                 }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
@@ -3844,7 +4088,7 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
     }
 }
 
-impl FindPetsByStatusStatusParameterInner {
+impl EnumTestEnumStringRequired {
     /// Helper function to allow us to convert this model to an XML string.
     /// Will panic if serialisation fails.
     #[allow(dead_code)]
@@ -3853,25 +4097,151 @@ impl FindPetsByStatusStatusParameterInner {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
-#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
-pub struct FormatTest {
-    #[serde(rename = "integer")]
-    #[validate(
-            range(min = 10, max = 100),
-        )]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub integer: Option<u8>,
-
-    #[serde(rename = "int32")]
-    #[validate(
-            range(min = 20, max = 200),
-        )]
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub int32: Option<u32>,
-
-    #[serde(rename = "int64")]
-    #[serde(skip_serializing_if="Option::is_none")]
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum FindPetsByStatusStatusParameterInner {
+    #[serde(rename = "available")]
+    Available,
+    #[serde(rename = "pending")]
+    Pending,
+    #[serde(rename = "sold")]
+    Sold,
+}
+
+impl std::fmt::Display for FindPetsByStatusStatusParameterInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            FindPetsByStatusStatusParameterInner::Available => write!(f, "available"),
+            FindPetsByStatusStatusParameterInner::Pending => write!(f, "pending"),
+            FindPetsByStatusStatusParameterInner::Sold => write!(f, "sold"),
+        }
+    }
+}
+
+impl std::str::FromStr for FindPetsByStatusStatusParameterInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "available" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Available),
+            "pending" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Pending),
+            "sold" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Sold),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for FindPetsByStatusStatusParameterInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<FindPetsByStatusStatusParameterInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl FindPetsByStatusStatusParameterInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
+#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+pub struct FormatTest {
+    #[serde(rename = "integer")]
+    #[validate(
+            range(min = 10, max = 100),
+        )]
+    #[serde(skip_serializing_if="Option::is_none")]
+    pub integer: Option<u8>,
+
+    #[serde(rename = "int32")]
+    #[validate(
+            range(min = 20, max = 200),
+        )]
+    #[serde(skip_serializing_if="Option::is_none")]
+    pub int32: Option<u32>,
+
+    #[serde(rename = "int64")]
+    #[serde(skip_serializing_if="Option::is_none")]
     pub int64: Option<i64>,
 
     #[serde(rename = "number")]
@@ -4570,7 +4940,7 @@ pub struct MapTest {
 
     #[serde(rename = "map_of_enum_string")]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub map_of_enum_string: Option<std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>,
+    pub map_of_enum_string: Option<std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>>,
 
 }
 
@@ -4614,7 +4984,7 @@ impl std::str::FromStr for MapTest {
         struct IntermediateRep {
             pub map_map_of_string: Vec<std::collections::HashMap<String, std::collections::HashMap<String, String>>>,
             pub map_map_of_enum: Vec<std::collections::HashMap<String, std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>>,
-            pub map_of_enum_string: Vec<std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>,
+            pub map_of_enum_string: Vec<std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>>,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -4861,6 +5231,128 @@ impl MapTestMapMapOfEnumValueValue {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum MapTestMapOfEnumStringValue {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+}
+
+impl std::fmt::Display for MapTestMapOfEnumStringValue {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            MapTestMapOfEnumStringValue::Upper => write!(f, "UPPER"),
+            MapTestMapOfEnumStringValue::Lower => write!(f, "lower"),
+        }
+    }
+}
+
+impl std::str::FromStr for MapTestMapOfEnumStringValue {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "UPPER" => std::result::Result::Ok(MapTestMapOfEnumStringValue::Upper),
+            "lower" => std::result::Result::Ok(MapTestMapOfEnumStringValue::Lower),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<MapTestMapOfEnumStringValue> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<MapTestMapOfEnumStringValue>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<MapTestMapOfEnumStringValue>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for MapTestMapOfEnumStringValue - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<MapTestMapOfEnumStringValue> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <MapTestMapOfEnumStringValue as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into MapTestMapOfEnumStringValue - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<MapTestMapOfEnumStringValue> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <MapTestMapOfEnumStringValue as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into MapTestMapOfEnumStringValue - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl MapTestMapOfEnumStringValue {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, validator::Validate)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct MixedPropertiesAndAdditionalPropertiesClass {
@@ -8030,16 +8522,142 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner {
 #[repr(C)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
 #[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum TestEnumParametersEnumQueryDoubleParameter {
-    #[serde(rename = "1.1")]
-    Variant11,
-    #[serde(rename = "-1.2")]
-    Variant12,
-}
-
-impl std::fmt::Display for TestEnumParametersEnumQueryDoubleParameter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
+pub enum TestEnumParametersEnumHeaderStringParameter {
+    #[serde(rename = "_abc")]
+    Abc,
+    #[serde(rename = "-efg")]
+    Efg,
+    #[serde(rename = "(xyz)")]
+    LeftParenthesisXyzRightParenthesis,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"),
+            TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"),
+            TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc),
+            "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg),
+            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumHeaderStringParameter> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumHeaderStringParameter {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryDoubleParameter {
+    #[serde(rename = "1.1")]
+    Variant11,
+    #[serde(rename = "-1.2")]
+    Variant12,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryDoubleParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
             TestEnumParametersEnumQueryDoubleParameter::Variant11 => write!(f, "1.1"),
             TestEnumParametersEnumQueryDoubleParameter::Variant12 => write!(f, "-1.2"),
         }
@@ -8267,6 +8885,254 @@ impl TestEnumParametersEnumQueryIntegerParameter {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryStringArrayParameterInner {
+    #[serde(rename = ">")]
+    GreaterThan,
+    #[serde(rename = "$")]
+    Dollar,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryStringArrayParameterInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumQueryStringArrayParameterInner::GreaterThan => write!(f, ">"),
+            TestEnumParametersEnumQueryStringArrayParameterInner::Dollar => write!(f, "$"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumQueryStringArrayParameterInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            ">" => std::result::Result::Ok(TestEnumParametersEnumQueryStringArrayParameterInner::GreaterThan),
+            "$" => std::result::Result::Ok(TestEnumParametersEnumQueryStringArrayParameterInner::Dollar),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumQueryStringArrayParameterInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumQueryStringArrayParameterInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumQueryStringArrayParameterInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumQueryStringArrayParameterInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumQueryStringArrayParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumQueryStringArrayParameterInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumQueryStringArrayParameterInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryStringParameter {
+    #[serde(rename = "_abc")]
+    Abc,
+    #[serde(rename = "-efg")]
+    Efg,
+    #[serde(rename = "(xyz)")]
+    LeftParenthesisXyzRightParenthesis,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryStringParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumQueryStringParameter::Abc => write!(f, "_abc"),
+            TestEnumParametersEnumQueryStringParameter::Efg => write!(f, "-efg"),
+            TestEnumParametersEnumQueryStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumQueryStringParameter {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "_abc" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::Abc),
+            "-efg" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::Efg),
+            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::LeftParenthesisXyzRightParenthesis),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumQueryStringParameter - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumQueryStringParameter - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumQueryStringParameter> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumQueryStringParameter - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumQueryStringParameter {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 /// Form parameter enum test (string)
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index f1ba3a1c86f8..b6c36d781032 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -987,7 +987,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string"));
 
                 let param_enum_header_string = match param_enum_header_string {
-                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersRequestEnumFormString>::try_from((*v).clone()) {
+                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersEnumHeaderStringParameter>::try_from((*v).clone()) {
                         Ok(result) =>
                             Some(result.0),
                         Err(err) => {
@@ -1018,7 +1018,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_enum_query_string = match param_enum_query_string {
                     Some(param_enum_query_string) => {
                         let param_enum_query_string =
-                            <models::TestEnumParametersRequestEnumFormString as std::str::FromStr>::from_str
+                            <models::TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str
                                 (&param_enum_query_string);
                         match param_enum_query_string {
                             Ok(param_enum_query_string) => Some(param_enum_query_string),
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
index 422fe9b45d10..c4fcf45912ba 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/FILES
@@ -5,6 +5,7 @@ README.md
 api/openapi.yaml
 bin/cli.rs
 docs/MultipartRelatedRequest.md
+docs/MultipartRelatedRequestObjectField.md
 docs/MultipartRequestObjectField.md
 docs/MultipleIdenticalMimeTypesPostRequest.md
 docs/default_api.md
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/README.md b/samples/server/petstore/rust-server/output/multipart-v3/README.md
index 8038b7411f22..119944e26b68 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/README.md
+++ b/samples/server/petstore/rust-server/output/multipart-v3/README.md
@@ -158,6 +158,7 @@ Method | HTTP request | Description
 ## Documentation For Models
 
  - [MultipartRelatedRequest](docs/MultipartRelatedRequest.md)
+ - [MultipartRelatedRequestObjectField](docs/MultipartRelatedRequestObjectField.md)
  - [MultipartRequestObjectField](docs/MultipartRequestObjectField.md)
  - [MultipleIdenticalMimeTypesPostRequest](docs/MultipleIdenticalMimeTypesPostRequest.md)
 
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/api/openapi.yaml b/samples/server/petstore/rust-server/output/multipart-v3/api/openapi.yaml
index 07e72037ff58..a98fe387a387 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/multipart-v3/api/openapi.yaml
@@ -88,7 +88,7 @@ components:
     multipart_related_request:
       properties:
         object_field:
-          $ref: "#/components/schemas/multipart_request_object_field"
+          $ref: "#/components/schemas/multipart_related_request_object_field"
         optional_binary_field:
           format: binary
           type: string
@@ -118,4 +118,15 @@ components:
       required:
       - field_a
       type: object
+    multipart_related_request_object_field:
+      properties:
+        field_a:
+          type: string
+        field_b:
+          items:
+            type: string
+          type: array
+      required:
+      - field_a
+      type: object
 
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/bin/cli.rs b/samples/server/petstore/rust-server/output/multipart-v3/bin/cli.rs
index df88edb242f5..0002f3a2dc45 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/bin/cli.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/bin/cli.rs
@@ -62,8 +62,8 @@ enum Operation {
     MultipartRelatedRequestPost {
         #[clap(value_parser = parse_json::<swagger::ByteArray>)]
         required_binary_field: swagger::ByteArray,
-        #[clap(value_parser = parse_json::<models::MultipartRequestObjectField>)]
-        object_field: Option<models::MultipartRequestObjectField>,
+        #[clap(value_parser = parse_json::<models::MultipartRelatedRequestObjectField>)]
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         #[clap(value_parser = parse_json::<swagger::ByteArray>)]
         optional_binary_field: Option<swagger::ByteArray>,
     },
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequest.md b/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequest.md
index 0180168d1ec6..6e75a808a1e1 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequest.md
+++ b/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequest.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**object_field** | [***models::MultipartRequestObjectField**](multipart_request_object_field.md) |  | [optional] [default to None]
+**object_field** | [***models::MultipartRelatedRequestObjectField**](multipart_related_request_object_field.md) |  | [optional] [default to None]
 **optional_binary_field** | [***swagger::ByteArray**](file.md) |  | [optional] [default to None]
 **required_binary_field** | [***swagger::ByteArray**](file.md) |  | 
 
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md b/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
new file mode 100644
index 000000000000..8936495eca1e
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/multipart-v3/docs/MultipartRelatedRequestObjectField.md
@@ -0,0 +1,11 @@
+# MultipartRelatedRequestObjectField
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**field_a** | **String** |  | 
+**field_b** | **Vec<String>** |  | [optional] [default to None]
+
+[[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/server/petstore/rust-server/output/multipart-v3/docs/default_api.md b/samples/server/petstore/rust-server/output/multipart-v3/docs/default_api.md
index 1e80b51a075c..9510718d3b0f 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/docs/default_api.md
+++ b/samples/server/petstore/rust-server/output/multipart-v3/docs/default_api.md
@@ -26,7 +26,7 @@ Optional parameters are passed through a map[string]interface{}.
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **required_binary_field** | **swagger::ByteArray**|  | 
- **object_field** | [**multipart_request_object_field**](multipart_request_object_field.md)|  | 
+ **object_field** | [**multipart_related_request_object_field**](multipart_related_request_object_field.md)|  | 
  **optional_binary_field** | **swagger::ByteArray**|  | 
 
 ### Return type
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/examples/server/server.rs b/samples/server/petstore/rust-server/output/multipart-v3/examples/server/server.rs
index 29377f99bde5..54ac3e9d7a37 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/examples/server/server.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/examples/server/server.rs
@@ -151,7 +151,7 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
index 7d7dffb7ab88..19be149ea110 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
@@ -450,7 +450,7 @@ impl<S, C, B> Api<C> for Client<S, C> where
     async fn multipart_related_request_post(
         &self,
         param_required_binary_field: swagger::ByteArray,
-        param_object_field: Option<models::MultipartRequestObjectField>,
+        param_object_field: Option<models::MultipartRelatedRequestObjectField>,
         param_optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/lib.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/lib.rs
index 43c3b8fb6e35..4cfc79dff4a8 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/lib.rs
@@ -47,7 +47,7 @@ pub trait Api<C: Send + Sync> {
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         context: &C) -> Result<MultipartRelatedRequestPostResponse, ApiError>;
 
@@ -82,7 +82,7 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         ) -> Result<MultipartRelatedRequestPostResponse, ApiError>;
 
@@ -124,7 +124,7 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn multipart_related_request_post(
         &self,
         required_binary_field: swagger::ByteArray,
-        object_field: Option<models::MultipartRequestObjectField>,
+        object_field: Option<models::MultipartRelatedRequestObjectField>,
         optional_binary_field: Option<swagger::ByteArray>,
         ) -> Result<MultipartRelatedRequestPostResponse, ApiError>
     {
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
index 60eefc819d75..03e30073c24a 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/models.rs
@@ -15,7 +15,7 @@ pub struct MultipartRelatedRequest {
 
     #[cfg_attr(feature = "validate", validate)]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub object_field: Option<models::MultipartRequestObjectField>,
+    pub object_field: Option<models::MultipartRelatedRequestObjectField>,
 
     #[serde(rename = "optional_binary_field")]
 
@@ -86,7 +86,7 @@ impl std::str::FromStr for MultipartRelatedRequest {
         #[derive(Default)]
         #[allow(dead_code)]
         struct IntermediateRep {
-            pub object_field: Vec<models::MultipartRequestObjectField>,
+            pub object_field: Vec<models::MultipartRelatedRequestObjectField>,
             pub optional_binary_field: Vec<swagger::ByteArray>,
             pub required_binary_field: Vec<swagger::ByteArray>,
         }
@@ -107,7 +107,7 @@ impl std::str::FromStr for MultipartRelatedRequest {
                 #[allow(clippy::match_single_binding)]
                 match key {
                     #[allow(clippy::redundant_clone)]
-                    "object_field" => intermediate_rep.object_field.push(<models::MultipartRequestObjectField as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "object_field" => intermediate_rep.object_field.push(<models::MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     "optional_binary_field" => return std::result::Result::Err("Parsing binary data in this style is not supported in MultipartRelatedRequest".to_string()),
                     "required_binary_field" => return std::result::Result::Err("Parsing binary data in this style is not supported in MultipartRelatedRequest".to_string()),
                     _ => return std::result::Result::Err("Unexpected key while parsing MultipartRelatedRequest".to_string())
@@ -205,6 +205,198 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+pub struct MultipartRelatedRequestObjectField {
+    #[serde(rename = "field_a")]
+
+    pub field_a: String,
+
+    #[serde(rename = "field_b")]
+
+    #[serde(skip_serializing_if="Option::is_none")]
+    pub field_b: Option<Vec<String>>,
+
+}
+
+#[cfg(feature = "validate")]
+impl serde_valid::validation::ValidateCompositedMinLength for MultipartRelatedRequestObjectField {
+    fn validate_composited_min_length(
+        &self,
+        _min_length: usize,
+    ) -> Result<(), serde_valid::validation::Composited<serde_valid::validation::error::MinLengthError>> {
+        Ok(())
+    }
+}
+
+#[cfg(feature = "validate")]
+impl serde_valid::validation::ValidateCompositedMaxLength for MultipartRelatedRequestObjectField {
+    fn validate_composited_max_length(
+        &self,
+        _max_length: usize,
+    ) -> Result<(), serde_valid::validation::Composited<serde_valid::validation::error::MaxLengthError>> {
+        Ok(())
+    }
+}
+
+
+impl MultipartRelatedRequestObjectField {
+    #[allow(clippy::new_without_default)]
+    pub fn new(field_a: String, ) -> MultipartRelatedRequestObjectField {
+        MultipartRelatedRequestObjectField {
+            field_a,
+            field_b: None,
+        }
+    }
+}
+
+/// Converts the MultipartRelatedRequestObjectField value to the Query Parameters representation (style=form, explode=false)
+/// specified in <https://swagger.io/docs/specification/serialization/>
+/// Should be implemented in a serde serializer
+impl std::fmt::Display for MultipartRelatedRequestObjectField {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let params: Vec<Option<String>> = vec![
+            Some("field_a".to_string()),
+            Some(self.field_a.to_string()),
+            self.field_b.as_ref().map(|field_b| {
+                [
+                    "field_b".to_string(),
+                    field_b.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(","),
+                ].join(",")
+            }),
+        ];
+
+        write!(f, "{}", params.into_iter().flatten().collect::<Vec<_>>().join(","))
+    }
+}
+
+/// Converts Query Parameters representation (style=form, explode=false) to a MultipartRelatedRequestObjectField value
+/// as specified in <https://swagger.io/docs/specification/serialization/>
+/// Should be implemented in a serde deserializer
+impl std::str::FromStr for MultipartRelatedRequestObjectField {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        /// An intermediate representation of the struct to use for parsing.
+        #[derive(Default)]
+        #[allow(dead_code)]
+        struct IntermediateRep {
+            pub field_a: Vec<String>,
+            pub field_b: Vec<Vec<String>>,
+        }
+
+        let mut intermediate_rep = IntermediateRep::default();
+
+        // Parse into intermediate representation
+        let mut string_iter = s.split(',');
+        let mut key_result = string_iter.next();
+
+        while key_result.is_some() {
+            let val = match string_iter.next() {
+                Some(x) => x,
+                None => return std::result::Result::Err("Missing value while parsing MultipartRelatedRequestObjectField".to_string())
+            };
+
+            if let Some(key) = key_result {
+                #[allow(clippy::match_single_binding)]
+                match key {
+                    #[allow(clippy::redundant_clone)]
+                    "field_a" => intermediate_rep.field_a.push(<String as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "field_b" => return std::result::Result::Err("Parsing a container in this style is not supported in MultipartRelatedRequestObjectField".to_string()),
+                    _ => return std::result::Result::Err("Unexpected key while parsing MultipartRelatedRequestObjectField".to_string())
+                }
+            }
+
+            // Get the next key
+            key_result = string_iter.next();
+        }
+
+        // Use the intermediate representation to return the struct
+        std::result::Result::Ok(MultipartRelatedRequestObjectField {
+            field_a: intermediate_rep.field_a.into_iter().next().ok_or_else(|| "field_a missing in MultipartRelatedRequestObjectField".to_string())?,
+            field_b: intermediate_rep.field_b.into_iter().next(),
+        })
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<MultipartRelatedRequestObjectField> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<MultipartRelatedRequestObjectField>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<MultipartRelatedRequestObjectField>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for MultipartRelatedRequestObjectField - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<MultipartRelatedRequestObjectField> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into MultipartRelatedRequestObjectField - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<MultipartRelatedRequestObjectField>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<MultipartRelatedRequestObjectField> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <MultipartRelatedRequestObjectField as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into MultipartRelatedRequestObjectField - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct MultipartRequestObjectField {
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs
index 6613e1e72d34..955fb9d46d4b 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs
@@ -346,15 +346,15 @@ where
                                             Some("application/json") if param_object_field.is_none() => {
                                                 // Extract JSON part.
                                                 let deserializer = &mut serde_json::Deserializer::from_slice(part.body.as_slice());
-                                                let json_data: models::MultipartRequestObjectField = match serde_ignored::deserialize(deserializer, |path| {
+                                                let json_data: models::MultipartRelatedRequestObjectField = match serde_ignored::deserialize(deserializer, |path| {
                                                     warn!("Ignoring unknown field in JSON part: {path}");
                                                     unused_elements.push(path.to_string());
                                                 }) {
                                                     Ok(json_data) => json_data,
                                                     Err(e) => return Ok(Response::builder()
                                                         .status(StatusCode::BAD_REQUEST)
-                                                        .body(BoxBody::new(format!("Couldn't parse body parameter models::MultipartRequestObjectField - doesn't match schema: {e}")))
-                                                        .expect("Unable to create Bad Request response for invalid body parameter models::MultipartRequestObjectField due to schema"))
+                                                        .body(BoxBody::new(format!("Couldn't parse body parameter models::MultipartRelatedRequestObjectField - doesn't match schema: {e}")))
+                                                        .expect("Unable to create Bad Request response for invalid body parameter models::MultipartRelatedRequestObjectField due to schema"))
                                                 };
                                                 // Push JSON part to return object.
                                                 param_object_field.get_or_insert(json_data);
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
index e70cf4b2482a..d29aa6816b94 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
@@ -11,6 +11,7 @@ docs/ApiResponse.md
 docs/ArrayOfArrayOfNumberOnly.md
 docs/ArrayOfNumberOnly.md
 docs/ArrayTest.md
+docs/ArrayTestArrayOfEnumInner.md
 docs/Capitalization.md
 docs/Cat.md
 docs/Category.md
@@ -25,13 +26,16 @@ docs/EnumArraysJustSymbol.md
 docs/EnumClass.md
 docs/EnumTest.md
 docs/EnumTestEnumInteger.md
+docs/EnumTestEnumNumber.md
 docs/EnumTestEnumString.md
+docs/EnumTestEnumStringRequired.md
 docs/FindPetsByStatusStatusParameterInner.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/List.md
 docs/MapTest.md
 docs/MapTestMapMapOfEnumValueValue.md
+docs/MapTestMapOfEnumStringValue.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
 docs/Name.md
@@ -51,8 +55,11 @@ docs/ReadOnlyFirst.md
 docs/Return.md
 docs/Tag.md
 docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md
+docs/TestEnumParametersEnumHeaderStringParameter.md
 docs/TestEnumParametersEnumQueryDoubleParameter.md
 docs/TestEnumParametersEnumQueryIntegerParameter.md
+docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
+docs/TestEnumParametersEnumQueryStringParameter.md
 docs/TestEnumParametersRequestEnumFormString.md
 docs/User.md
 docs/another_fake_api.md
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
index a0ed96b6df0d..38a8ec28ffa9 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -213,6 +213,7 @@ Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [ArrayTestArrayOfEnumInner](docs/ArrayTestArrayOfEnumInner.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
@@ -227,13 +228,16 @@ Method | HTTP request | Description
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
  - [EnumTestEnumInteger](docs/EnumTestEnumInteger.md)
+ - [EnumTestEnumNumber](docs/EnumTestEnumNumber.md)
  - [EnumTestEnumString](docs/EnumTestEnumString.md)
+ - [EnumTestEnumStringRequired](docs/EnumTestEnumStringRequired.md)
  - [FindPetsByStatusStatusParameterInner](docs/FindPetsByStatusStatusParameterInner.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [List](docs/List.md)
  - [MapTest](docs/MapTest.md)
  - [MapTestMapMapOfEnumValueValue](docs/MapTestMapMapOfEnumValueValue.md)
+ - [MapTestMapOfEnumStringValue](docs/MapTestMapOfEnumStringValue.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [Name](docs/Name.md)
@@ -253,8 +257,11 @@ Method | HTTP request | Description
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md)
+ - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
  - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
  - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
+ - [TestEnumParametersEnumQueryStringArrayParameterInner](docs/TestEnumParametersEnumQueryStringArrayParameterInner.md)
+ - [TestEnumParametersEnumQueryStringParameter](docs/TestEnumParametersEnumQueryStringParameter.md)
  - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
  - [User](docs/User.md)
 
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
index 2d1be7d9a6b8..2bc3ee819ba8 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -599,21 +599,21 @@ paths:
         in: header
         name: enum_header_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
       - description: Query parameter enum test (string array)
         explode: false
         in: query
         name: enum_query_string_array
         schema:
           items:
-            $ref: "#/components/schemas/testEnumParameters_enum_header_string_array_parameter_inner"
+            $ref: "#/components/schemas/testEnumParameters_enum_query_string_array_parameter_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
         in: query
         name: enum_query_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
+          $ref: "#/components/schemas/testEnumParameters_enum_query_string_parameter"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_integer
@@ -1195,11 +1195,11 @@ components:
         enum_string:
           $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          $ref: "#/components/schemas/Enum_Test_enum_string"
+          $ref: "#/components/schemas/Enum_Test_enum_string_required"
         enum_integer:
           $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_number:
-          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
+          $ref: "#/components/schemas/Enum_Test_enum_number"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
       required:
@@ -1302,7 +1302,7 @@ components:
           type: object
         map_of_enum_string:
           additionalProperties:
-            $ref: "#/components/schemas/MapTest_map_map_of_enum_value_value"
+            $ref: "#/components/schemas/MapTest_map_of_enum_string_value"
           type: object
       type: object
     ArrayTest:
@@ -1326,7 +1326,7 @@ components:
           type: array
         array_of_enum:
           items:
-            $ref: "#/components/schemas/MapTest_map_map_of_enum_value_value"
+            $ref: "#/components/schemas/ArrayTest_array_of_enum_inner"
           type: array
       type: object
     NumberOnly:
@@ -1437,6 +1437,26 @@ components:
       - '>'
       - $
       type: string
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_string_array_parameter_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_enum_query_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
@@ -1554,17 +1574,39 @@ components:
       - lower
       - ""
       type: string
+    Enum_Test_enum_string_required:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      type: string
     Enum_Test_enum_integer:
       enum:
       - 1
       - -1
       format: int32
       type: integer
+    Enum_Test_enum_number:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     MapTest_map_map_of_enum_value_value:
       enum:
       - UPPER
       - lower
       type: string
+    MapTest_map_of_enum_string_value:
+      enum:
+      - UPPER
+      - lower
+      type: string
+    ArrayTest_array_of_enum_inner:
+      enum:
+      - UPPER
+      - lower
+      type: string
     EnumArrays_just_symbol:
       enum:
       - '>='
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
index 974d1f3d6587..6d31d86344d2 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
@@ -185,14 +185,14 @@ enum Operation {
         #[clap(value_parser = parse_json::<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>, long)]
         enum_header_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Header parameter enum test (string)
-        #[clap(value_parser = parse_json::<models::TestEnumParametersRequestEnumFormString>)]
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        #[clap(value_parser = parse_json::<models::TestEnumParametersEnumHeaderStringParameter>)]
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
         /// Query parameter enum test (string array)
-        #[clap(value_parser = parse_json::<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>, long)]
-        enum_query_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
+        #[clap(value_parser = parse_json::<Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>, long)]
+        enum_query_string_array: Option<Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
         /// Query parameter enum test (string)
-        #[clap(value_parser = parse_json::<models::TestEnumParametersRequestEnumFormString>)]
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        #[clap(value_parser = parse_json::<models::TestEnumParametersEnumQueryStringParameter>)]
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         /// Query parameter enum test (double)
         #[clap(value_parser = parse_json::<models::TestEnumParametersEnumQueryIntegerParameter>)]
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
index b563bd578c86..671ebb3c1a84 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **array_of_string** | **Vec<String>** |  | [optional] [default to None]
 **array_array_of_integer** | [**Vec<Vec<i64>>**](array.md) |  | [optional] [default to None]
 **array_array_of_model** | [**Vec<Vec<models::ReadOnlyFirst>>**](array.md) |  | [optional] [default to None]
-**array_of_enum** | [**Vec<models::MapTestMapMapOfEnumValueValue>**](MapTest_map_map_of_enum_value_value.md) |  | [optional] [default to None]
+**array_of_enum** | [**Vec<models::ArrayTestArrayOfEnumInner>**](ArrayTest_array_of_enum_inner.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
new file mode 100644
index 000000000000..dc52a2c6f275
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/ArrayTestArrayOfEnumInner.md
@@ -0,0 +1,9 @@
+# ArrayTestArrayOfEnumInner
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
index cf89b12718d7..396ed88f428d 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTest.md
@@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_string** | [***models::EnumTestEnumString**](Enum_Test_enum_string.md) |  | [optional] [default to None]
-**enum_string_required** | [***models::EnumTestEnumString**](Enum_Test_enum_string.md) |  | 
+**enum_string_required** | [***models::EnumTestEnumStringRequired**](Enum_Test_enum_string_required.md) |  | 
 **enum_integer** | [***models::EnumTestEnumInteger**](Enum_Test_enum_integer.md) |  | [optional] [default to None]
-**enum_number** | [***models::TestEnumParametersEnumQueryDoubleParameter**](testEnumParameters_enum_query_double_parameter.md) |  | [optional] [default to None]
+**enum_number** | [***models::EnumTestEnumNumber**](Enum_Test_enum_number.md) |  | [optional] [default to None]
 **outer_enum** | [***models::OuterEnum**](OuterEnum.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
new file mode 100644
index 000000000000..57d4328c01b4
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumNumber.md
@@ -0,0 +1,9 @@
+# EnumTestEnumNumber
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
new file mode 100644
index 000000000000..a6a706ae35c9
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/EnumTestEnumStringRequired.md
@@ -0,0 +1,9 @@
+# EnumTestEnumStringRequired
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
index 590eae909b98..d134b82165ee 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTest.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **map_map_of_string** | [**std::collections::HashMap<String, std::collections::HashMap<String, String>>**](map.md) |  | [optional] [default to None]
 **map_map_of_enum** | [**std::collections::HashMap<String, std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>**](map.md) |  | [optional] [default to None]
-**map_of_enum_string** | [**std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>**](MapTest_map_map_of_enum_value_value.md) |  | [optional] [default to None]
+**map_of_enum_string** | [**std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>**](MapTest_map_of_enum_string_value.md) |  | [optional] [default to None]
 
 [[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
new file mode 100644
index 000000000000..118b189dea38
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/MapTestMapOfEnumStringValue.md
@@ -0,0 +1,9 @@
+# MapTestMapOfEnumStringValue
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
new file mode 100644
index 000000000000..c7fa36ea83e7
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringArrayParameterInner.md
@@ -0,0 +1,9 @@
+# TestEnumParametersEnumQueryStringArrayParameterInner
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md
new file mode 100644
index 000000000000..a3d1b5bdf448
--- /dev/null
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/TestEnumParametersEnumQueryStringParameter.md
@@ -0,0 +1,9 @@
+# TestEnumParametersEnumQueryStringParameter
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
index 9b690e7b1ff3..07de869606af 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/docs/fake_api.md
@@ -323,7 +323,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enum_header_string_array** | [**models::TestEnumParametersEnumHeaderStringArrayParameterInner**](models::TestEnumParametersEnumHeaderStringArrayParameterInner.md)| Header parameter enum test (string array) | 
  **enum_header_string** | [****](.md)| Header parameter enum test (string) | 
- **enum_query_string_array** | [**models::TestEnumParametersEnumHeaderStringArrayParameterInner**](models::TestEnumParametersEnumHeaderStringArrayParameterInner.md)| Query parameter enum test (string array) | 
+ **enum_query_string_array** | [**models::TestEnumParametersEnumQueryStringArrayParameterInner**](models::TestEnumParametersEnumQueryStringArrayParameterInner.md)| Query parameter enum test (string array) | 
  **enum_query_string** | [****](.md)| Query parameter enum test (string) | 
  **enum_query_integer** | [****](.md)| Query parameter enum test (double) | 
  **enum_query_double** | [****](.md)| Query parameter enum test (double) | 
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
index e4a1cf520169..c353121eea26 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
@@ -254,9 +254,9 @@ fn main() {
         Some("TestEnumParameters") => {
             let result = rt.block_on(client.test_enum_parameters(
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
+                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
+                  Some(models::TestEnumParametersEnumQueryStringParameter::Abc),
                   Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1),
                   Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11),
                   Some(models::TestEnumParametersRequestEnumFormString::Abc)
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
index 5afa1ea86240..c7b58ec7031c 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
@@ -289,9 +289,9 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index 8aa1102e56ff..bf90bbfff1de 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -1426,9 +1426,9 @@ impl<S, C, B> Api<C> for Client<S, C> where
     async fn test_enum_parameters<'a>(
         &self,
         param_enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        param_enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        param_enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        param_enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         param_enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         param_enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         param_enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
index e4fe8a3e78f9..7e995ad562cb 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
@@ -396,9 +396,9 @@ pub trait Api<C: Send + Sync> {
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -636,9 +636,9 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -923,9 +923,9 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
-        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
+        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumQueryStringArrayParameterInner>>,
+        enum_query_string: Option<models::TestEnumParametersEnumQueryStringParameter>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index cb704dc645d2..781406d2ebc3 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -1204,7 +1204,7 @@ pub struct ArrayTest {
 
     #[cfg_attr(feature = "validate", validate)]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub array_of_enum: Option<Vec<models::MapTestMapMapOfEnumValueValue>>,
+    pub array_of_enum: Option<Vec<models::ArrayTestArrayOfEnumInner>>,
 
 }
 
@@ -1276,7 +1276,7 @@ impl std::str::FromStr for ArrayTest {
             pub array_of_string: Vec<Vec<String>>,
             pub array_array_of_integer: Vec<Vec<Vec<i64>>>,
             pub array_array_of_model: Vec<Vec<Vec<models::ReadOnlyFirst>>>,
-            pub array_of_enum: Vec<Vec<models::MapTestMapMapOfEnumValueValue>>,
+            pub array_of_enum: Vec<Vec<models::ArrayTestArrayOfEnumInner>>,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -1403,6 +1403,129 @@ impl ArrayTest {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum ArrayTestArrayOfEnumInner {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+}
+
+impl std::fmt::Display for ArrayTestArrayOfEnumInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            ArrayTestArrayOfEnumInner::Upper => write!(f, "UPPER"),
+            ArrayTestArrayOfEnumInner::Lower => write!(f, "lower"),
+        }
+    }
+}
+
+impl std::str::FromStr for ArrayTestArrayOfEnumInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "UPPER" => std::result::Result::Ok(ArrayTestArrayOfEnumInner::Upper),
+            "lower" => std::result::Result::Ok(ArrayTestArrayOfEnumInner::Lower),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<ArrayTestArrayOfEnumInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<ArrayTestArrayOfEnumInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<ArrayTestArrayOfEnumInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for ArrayTestArrayOfEnumInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<ArrayTestArrayOfEnumInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <ArrayTestArrayOfEnumInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into ArrayTestArrayOfEnumInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<ArrayTestArrayOfEnumInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<ArrayTestArrayOfEnumInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <ArrayTestArrayOfEnumInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into ArrayTestArrayOfEnumInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl ArrayTestArrayOfEnumInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct Capitalization {
@@ -3611,7 +3734,7 @@ pub struct EnumTest {
     #[serde(rename = "enum_string_required")]
 
     #[cfg_attr(feature = "validate", validate)]
-    pub enum_string_required: models::EnumTestEnumString,
+    pub enum_string_required: models::EnumTestEnumStringRequired,
 
     #[serde(rename = "enum_integer")]
 
@@ -3623,7 +3746,7 @@ pub struct EnumTest {
 
     #[cfg_attr(feature = "validate", validate)]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub enum_number: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
+    pub enum_number: Option<models::EnumTestEnumNumber>,
 
     #[serde(rename = "outerEnum")]
 
@@ -3656,7 +3779,7 @@ impl serde_valid::validation::ValidateCompositedMaxLength for EnumTest {
 
 impl EnumTest {
     #[allow(clippy::new_without_default)]
-    pub fn new(enum_string_required: models::EnumTestEnumString, ) -> EnumTest {
+    pub fn new(enum_string_required: models::EnumTestEnumStringRequired, ) -> EnumTest {
         EnumTest {
             enum_string: None,
             enum_string_required,
@@ -3696,9 +3819,9 @@ impl std::str::FromStr for EnumTest {
         #[allow(dead_code)]
         struct IntermediateRep {
             pub enum_string: Vec<models::EnumTestEnumString>,
-            pub enum_string_required: Vec<models::EnumTestEnumString>,
+            pub enum_string_required: Vec<models::EnumTestEnumStringRequired>,
             pub enum_integer: Vec<models::EnumTestEnumInteger>,
-            pub enum_number: Vec<models::TestEnumParametersEnumQueryDoubleParameter>,
+            pub enum_number: Vec<models::EnumTestEnumNumber>,
             pub outer_enum: Vec<models::OuterEnum>,
         }
 
@@ -3720,11 +3843,11 @@ impl std::str::FromStr for EnumTest {
                     #[allow(clippy::redundant_clone)]
                     "enum_string" => intermediate_rep.enum_string.push(<models::EnumTestEnumString as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
-                    "enum_string_required" => intermediate_rep.enum_string_required.push(<models::EnumTestEnumString as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "enum_string_required" => intermediate_rep.enum_string_required.push(<models::EnumTestEnumStringRequired as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
                     "enum_integer" => intermediate_rep.enum_integer.push(<models::EnumTestEnumInteger as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
-                    "enum_number" => intermediate_rep.enum_number.push(<models::TestEnumParametersEnumQueryDoubleParameter as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
+                    "enum_number" => intermediate_rep.enum_number.push(<models::EnumTestEnumNumber as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     #[allow(clippy::redundant_clone)]
                     "outerEnum" => intermediate_rep.outer_enum.push(<models::OuterEnum as std::str::FromStr>::from_str(val).map_err(|x| x.to_string())?),
                     _ => return std::result::Result::Err("Unexpected key while parsing EnumTest".to_string())
@@ -3951,6 +4074,129 @@ impl EnumTestEnumInteger {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum EnumTestEnumNumber {
+    #[serde(rename = "1.1")]
+    Variant11,
+    #[serde(rename = "-1.2")]
+    Variant12,
+}
+
+impl std::fmt::Display for EnumTestEnumNumber {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            EnumTestEnumNumber::Variant11 => write!(f, "1.1"),
+            EnumTestEnumNumber::Variant12 => write!(f, "-1.2"),
+        }
+    }
+}
+
+impl std::str::FromStr for EnumTestEnumNumber {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "1.1" => std::result::Result::Ok(EnumTestEnumNumber::Variant11),
+            "-1.2" => std::result::Result::Ok(EnumTestEnumNumber::Variant12),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<EnumTestEnumNumber> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<EnumTestEnumNumber>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<EnumTestEnumNumber>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for EnumTestEnumNumber - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<EnumTestEnumNumber> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <EnumTestEnumNumber as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into EnumTestEnumNumber - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<EnumTestEnumNumber>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<EnumTestEnumNumber>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<EnumTestEnumNumber>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<EnumTestEnumNumber> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <EnumTestEnumNumber as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into EnumTestEnumNumber - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl EnumTestEnumNumber {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
@@ -4086,65 +4332,65 @@ impl EnumTestEnumString {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
 #[cfg_attr(feature = "validate", derive(Validate))]
 #[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum FindPetsByStatusStatusParameterInner {
-    #[serde(rename = "available")]
-    Available,
-    #[serde(rename = "pending")]
-    Pending,
-    #[serde(rename = "sold")]
-    Sold,
+pub enum EnumTestEnumStringRequired {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+    #[serde(rename = "")]
+    Empty,
 }
 
-impl std::fmt::Display for FindPetsByStatusStatusParameterInner {
+impl std::fmt::Display for EnumTestEnumStringRequired {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
-            FindPetsByStatusStatusParameterInner::Available => write!(f, "available"),
-            FindPetsByStatusStatusParameterInner::Pending => write!(f, "pending"),
-            FindPetsByStatusStatusParameterInner::Sold => write!(f, "sold"),
+            EnumTestEnumStringRequired::Upper => write!(f, "UPPER"),
+            EnumTestEnumStringRequired::Lower => write!(f, "lower"),
+            EnumTestEnumStringRequired::Empty => write!(f, ""),
         }
     }
 }
 
-impl std::str::FromStr for FindPetsByStatusStatusParameterInner {
+impl std::str::FromStr for EnumTestEnumStringRequired {
     type Err = String;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
         match s {
-            "available" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Available),
-            "pending" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Pending),
-            "sold" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Sold),
+            "UPPER" => std::result::Result::Ok(EnumTestEnumStringRequired::Upper),
+            "lower" => std::result::Result::Ok(EnumTestEnumStringRequired::Lower),
+            "" => std::result::Result::Ok(EnumTestEnumStringRequired::Empty),
             _ => std::result::Result::Err(format!("Value not valid: {s}")),
         }
     }
 }
 
-// Methods for converting between header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> and hyper::header::HeaderValue
+// Methods for converting between header::IntoHeaderValue<EnumTestEnumStringRequired> and hyper::header::HeaderValue
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>> for hyper::header::HeaderValue {
+impl std::convert::TryFrom<header::IntoHeaderValue<EnumTestEnumStringRequired>> for hyper::header::HeaderValue {
     type Error = String;
 
-    fn try_from(hdr_value: header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>) -> std::result::Result<Self, Self::Error> {
+    fn try_from(hdr_value: header::IntoHeaderValue<EnumTestEnumStringRequired>) -> std::result::Result<Self, Self::Error> {
         let hdr_value = hdr_value.to_string();
         match hyper::header::HeaderValue::from_str(&hdr_value) {
              std::result::Result::Ok(value) => std::result::Result::Ok(value),
              std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Invalid header value for FindPetsByStatusStatusParameterInner - value: {hdr_value} is invalid {e}"))
+                 format!("Invalid header value for EnumTestEnumStringRequired - value: {hdr_value} is invalid {e}"))
         }
     }
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> {
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<EnumTestEnumStringRequired> {
     type Error = String;
 
     fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
         match hdr_value.to_str() {
              std::result::Result::Ok(value) => {
-                    match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(value) {
+                    match <EnumTestEnumStringRequired as std::str::FromStr>::from_str(value) {
                         std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
                         std::result::Result::Err(err) => std::result::Result::Err(
-                            format!("Unable to convert header value '{value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                            format!("Unable to convert header value '{value}' into EnumTestEnumStringRequired - {err}"))
                     }
              },
              std::result::Result::Err(e) => std::result::Result::Err(
@@ -4154,10 +4400,10 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>> for hyper::header::HeaderValue {
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>>> for hyper::header::HeaderValue {
     type Error = String;
 
-    fn try_from(hdr_values: header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>) -> std::result::Result<Self, Self::Error> {
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>>) -> std::result::Result<Self, Self::Error> {
         let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
             hdr_value.to_string()
         }).collect();
@@ -4170,21 +4416,21 @@ impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusPar
 }
 
 #[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>> {
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<EnumTestEnumStringRequired>> {
     type Error = String;
 
     fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
         match hdr_values.to_str() {
             std::result::Result::Ok(hdr_values) => {
-                let hdr_values : std::vec::Vec<FindPetsByStatusStatusParameterInner> = hdr_values
+                let hdr_values : std::vec::Vec<EnumTestEnumStringRequired> = hdr_values
                 .split(',')
                 .filter_map(|hdr_value| match hdr_value.trim() {
                     "" => std::option::Option::None,
                     hdr_value => std::option::Option::Some({
-                        match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                        match <EnumTestEnumStringRequired as std::str::FromStr>::from_str(hdr_value) {
                             std::result::Result::Ok(value) => std::result::Result::Ok(value),
                             std::result::Result::Err(err) => std::result::Result::Err(
-                                format!("Unable to convert header value '{hdr_value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                                format!("Unable to convert header value '{hdr_value}' into EnumTestEnumStringRequired - {err}"))
                         }
                     })
                 }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
@@ -4196,7 +4442,7 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
     }
 }
 
-impl FindPetsByStatusStatusParameterInner {
+impl EnumTestEnumStringRequired {
     /// Helper function to allow us to convert this model to an XML string.
     /// Will panic if serialisation fails.
     #[allow(dead_code)]
@@ -4205,23 +4451,150 @@ impl FindPetsByStatusStatusParameterInner {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
-#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
-pub struct FormatTest {
-    #[serde(rename = "integer")]
-    #[cfg_attr(not(feature = "validate"), validate(
-            range(min = 10u8, max = 100u8),
-        ))]
-    #[cfg_attr(feature = "validate", validate(minimum = 10u8))]
-    #[cfg_attr(feature = "validate", validate(maximum = 100u8))]
-
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub integer: Option<u8>,
-
-    #[serde(rename = "int32")]
-    #[cfg_attr(not(feature = "validate"), validate(
-            range(min = 20u32, max = 200u32),
-        ))]
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum FindPetsByStatusStatusParameterInner {
+    #[serde(rename = "available")]
+    Available,
+    #[serde(rename = "pending")]
+    Pending,
+    #[serde(rename = "sold")]
+    Sold,
+}
+
+impl std::fmt::Display for FindPetsByStatusStatusParameterInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            FindPetsByStatusStatusParameterInner::Available => write!(f, "available"),
+            FindPetsByStatusStatusParameterInner::Pending => write!(f, "pending"),
+            FindPetsByStatusStatusParameterInner::Sold => write!(f, "sold"),
+        }
+    }
+}
+
+impl std::str::FromStr for FindPetsByStatusStatusParameterInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "available" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Available),
+            "pending" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Pending),
+            "sold" => std::result::Result::Ok(FindPetsByStatusStatusParameterInner::Sold),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<FindPetsByStatusStatusParameterInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for FindPetsByStatusStatusParameterInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<FindPetsByStatusStatusParameterInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<FindPetsByStatusStatusParameterInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<FindPetsByStatusStatusParameterInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <FindPetsByStatusStatusParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into FindPetsByStatusStatusParameterInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl FindPetsByStatusStatusParameterInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+pub struct FormatTest {
+    #[serde(rename = "integer")]
+    #[cfg_attr(not(feature = "validate"), validate(
+            range(min = 10u8, max = 100u8),
+        ))]
+    #[cfg_attr(feature = "validate", validate(minimum = 10u8))]
+    #[cfg_attr(feature = "validate", validate(maximum = 100u8))]
+
+    #[serde(skip_serializing_if="Option::is_none")]
+    pub integer: Option<u8>,
+
+    #[serde(rename = "int32")]
+    #[cfg_attr(not(feature = "validate"), validate(
+            range(min = 20u32, max = 200u32),
+        ))]
     #[cfg_attr(feature = "validate", validate(minimum = 20u32))]
     #[cfg_attr(feature = "validate", validate(maximum = 200u32))]
 
@@ -5017,7 +5390,7 @@ pub struct MapTest {
 
     #[cfg_attr(feature = "validate", validate)]
     #[serde(skip_serializing_if="Option::is_none")]
-    pub map_of_enum_string: Option<std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>,
+    pub map_of_enum_string: Option<std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>>,
 
 }
 
@@ -5081,7 +5454,7 @@ impl std::str::FromStr for MapTest {
         struct IntermediateRep {
             pub map_map_of_string: Vec<std::collections::HashMap<String, std::collections::HashMap<String, String>>>,
             pub map_map_of_enum: Vec<std::collections::HashMap<String, std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>>,
-            pub map_of_enum_string: Vec<std::collections::HashMap<String, models::MapTestMapMapOfEnumValueValue>>,
+            pub map_of_enum_string: Vec<std::collections::HashMap<String, models::MapTestMapOfEnumStringValue>>,
         }
 
         let mut intermediate_rep = IntermediateRep::default();
@@ -5329,6 +5702,129 @@ impl MapTestMapMapOfEnumValueValue {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum MapTestMapOfEnumStringValue {
+    #[serde(rename = "UPPER")]
+    Upper,
+    #[serde(rename = "lower")]
+    Lower,
+}
+
+impl std::fmt::Display for MapTestMapOfEnumStringValue {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            MapTestMapOfEnumStringValue::Upper => write!(f, "UPPER"),
+            MapTestMapOfEnumStringValue::Lower => write!(f, "lower"),
+        }
+    }
+}
+
+impl std::str::FromStr for MapTestMapOfEnumStringValue {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "UPPER" => std::result::Result::Ok(MapTestMapOfEnumStringValue::Upper),
+            "lower" => std::result::Result::Ok(MapTestMapOfEnumStringValue::Lower),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<MapTestMapOfEnumStringValue> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<MapTestMapOfEnumStringValue>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<MapTestMapOfEnumStringValue>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for MapTestMapOfEnumStringValue - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<MapTestMapOfEnumStringValue> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <MapTestMapOfEnumStringValue as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into MapTestMapOfEnumStringValue - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<MapTestMapOfEnumStringValue>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<MapTestMapOfEnumStringValue> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <MapTestMapOfEnumStringValue as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into MapTestMapOfEnumStringValue - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl MapTestMapOfEnumStringValue {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Validate, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
 pub struct MixedPropertiesAndAdditionalPropertiesClass {
@@ -8848,16 +9344,143 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
 #[cfg_attr(feature = "validate", derive(Validate))]
 #[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum TestEnumParametersEnumQueryDoubleParameter {
-    #[serde(rename = "1.1")]
-    Variant11,
-    #[serde(rename = "-1.2")]
-    Variant12,
-}
-
-impl std::fmt::Display for TestEnumParametersEnumQueryDoubleParameter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
+pub enum TestEnumParametersEnumHeaderStringParameter {
+    #[serde(rename = "_abc")]
+    Abc,
+    #[serde(rename = "-efg")]
+    Efg,
+    #[serde(rename = "(xyz)")]
+    LeftParenthesisXyzRightParenthesis,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"),
+            TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"),
+            TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc),
+            "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg),
+            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumHeaderStringParameter> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumHeaderStringParameter {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryDoubleParameter {
+    #[serde(rename = "1.1")]
+    Variant11,
+    #[serde(rename = "-1.2")]
+    Variant12,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryDoubleParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
             TestEnumParametersEnumQueryDoubleParameter::Variant11 => write!(f, "1.1"),
             TestEnumParametersEnumQueryDoubleParameter::Variant12 => write!(f, "-1.2"),
         }
@@ -9081,6 +9704,256 @@ impl TestEnumParametersEnumQueryIntegerParameter {
     }
 }
 
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryStringArrayParameterInner {
+    #[serde(rename = ">")]
+    GreaterThan,
+    #[serde(rename = "$")]
+    Dollar,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryStringArrayParameterInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumQueryStringArrayParameterInner::GreaterThan => write!(f, ">"),
+            TestEnumParametersEnumQueryStringArrayParameterInner::Dollar => write!(f, "$"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumQueryStringArrayParameterInner {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            ">" => std::result::Result::Ok(TestEnumParametersEnumQueryStringArrayParameterInner::GreaterThan),
+            "$" => std::result::Result::Ok(TestEnumParametersEnumQueryStringArrayParameterInner::Dollar),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumQueryStringArrayParameterInner - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumQueryStringArrayParameterInner> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumQueryStringArrayParameterInner as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumQueryStringArrayParameterInner - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringArrayParameterInner>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumQueryStringArrayParameterInner> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumQueryStringArrayParameterInner as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumQueryStringArrayParameterInner - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumQueryStringArrayParameterInner {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
+/// Enumeration of values.
+/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
+/// which helps with FFI.
+#[allow(non_camel_case_types)]
+#[repr(C)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
+#[cfg_attr(feature = "validate", derive(Validate))]
+#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
+pub enum TestEnumParametersEnumQueryStringParameter {
+    #[serde(rename = "_abc")]
+    Abc,
+    #[serde(rename = "-efg")]
+    Efg,
+    #[serde(rename = "(xyz)")]
+    LeftParenthesisXyzRightParenthesis,
+}
+
+impl std::fmt::Display for TestEnumParametersEnumQueryStringParameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            TestEnumParametersEnumQueryStringParameter::Abc => write!(f, "_abc"),
+            TestEnumParametersEnumQueryStringParameter::Efg => write!(f, "-efg"),
+            TestEnumParametersEnumQueryStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
+        }
+    }
+}
+
+impl std::str::FromStr for TestEnumParametersEnumQueryStringParameter {
+    type Err = String;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        match s {
+            "_abc" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::Abc),
+            "-efg" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::Efg),
+            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumQueryStringParameter::LeftParenthesisXyzRightParenthesis),
+            _ => std::result::Result::Err(format!("Value not valid: {s}")),
+        }
+    }
+}
+
+// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter> and hyper::header::HeaderValue
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter>) -> std::result::Result<Self, Self::Error> {
+        let hdr_value = hdr_value.to_string();
+        match hyper::header::HeaderValue::from_str(&hdr_value) {
+             std::result::Result::Ok(value) => std::result::Result::Ok(value),
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Invalid header value for TestEnumParametersEnumQueryStringParameter - value: {hdr_value} is invalid {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumQueryStringParameter> {
+    type Error = String;
+
+    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_value.to_str() {
+             std::result::Result::Ok(value) => {
+                    match <TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str(value) {
+                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
+                        std::result::Result::Err(err) => std::result::Result::Err(
+                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumQueryStringParameter - {err}"))
+                    }
+             },
+             std::result::Result::Err(e) => std::result::Result::Err(
+                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>>> for hyper::header::HeaderValue {
+    type Error = String;
+
+    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>>) -> std::result::Result<Self, Self::Error> {
+        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
+            hdr_value.to_string()
+        }).collect();
+
+        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
+           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
+           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
+        }
+    }
+}
+
+#[cfg(any(feature = "client", feature = "server"))]
+impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumQueryStringParameter>> {
+    type Error = String;
+
+    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
+        match hdr_values.to_str() {
+            std::result::Result::Ok(hdr_values) => {
+                let hdr_values : std::vec::Vec<TestEnumParametersEnumQueryStringParameter> = hdr_values
+                .split(',')
+                .filter_map(|hdr_value| match hdr_value.trim() {
+                    "" => std::option::Option::None,
+                    hdr_value => std::option::Option::Some({
+                        match <TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str(hdr_value) {
+                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
+                            std::result::Result::Err(err) => std::result::Result::Err(
+                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumQueryStringParameter - {err}"))
+                        }
+                    })
+                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
+
+                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
+            },
+            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
+        }
+    }
+}
+
+impl TestEnumParametersEnumQueryStringParameter {
+    /// Helper function to allow us to convert this model to an XML string.
+    /// Will panic if serialisation fails.
+    #[allow(dead_code)]
+    pub(crate) fn as_xml(&self) -> String {
+        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
+    }
+}
+
 /// Form parameter enum test (string)
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index 658f977e24d5..52d54b89b411 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -1487,7 +1487,7 @@ where
                 let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string"));
 
                 let param_enum_header_string = match param_enum_header_string {
-                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersRequestEnumFormString>::try_from((*v).clone()) {
+                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersEnumHeaderStringParameter>::try_from((*v).clone()) {
                         Ok(result) =>
                             Some(result.0),
                         Err(err) => {
@@ -1518,7 +1518,7 @@ where
                 let param_enum_query_string = match param_enum_query_string {
                     Some(param_enum_query_string) => {
                         let param_enum_query_string =
-                            <models::TestEnumParametersRequestEnumFormString as std::str::FromStr>::from_str
+                            <models::TestEnumParametersEnumQueryStringParameter as std::str::FromStr>::from_str
                                 (&param_enum_query_string);
                         match param_enum_query_string {
                             Ok(param_enum_query_string) => Some(param_enum_query_string),