diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
index b7e788cc56b1..251c43d116e4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
@@ -113,6 +113,9 @@ public GoClientCodegen() {
         outputFolder = "generated-code/go";
         embeddedTemplateDir = templateDir = "go";
 
+        // We need inline enums to be resolved to a separate model
+        inlineSchemaOption.put("RESOLVE_INLINE_ENUMS", "true");
+
         apiTemplateFiles.put("api.mustache", ".go");
         modelTemplateFiles.put("model.mustache", ".go");
         apiTestTemplateFiles.put("api_test.mustache", ".go");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
index 15140317d543..d9746187b826 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
@@ -174,7 +174,7 @@ public void testMultipleRequiredPropertiesHasSameOneOfObject() throws IOExceptio
         files.forEach(File::deleteOnExit);
 
         Path docFile = Paths.get(output + "/docs/PetAPI.md");
-        TestUtils.assertFileContains(docFile, "openapiclient.pet{Cat: openapiclient.NewCat(\"Attr_example\")}, openapiclient.pet{Cat: openapiclient.NewCat(\"Attr_example\")}, openapiclient.pet{Cat: openapiclient.NewCat(\"Attr_example\")}");
+        TestUtils.assertFileContains(docFile, "openapiclient.pet{Cat: openapiclient.NewCat(openapiclient.cat_attr(\"CAT\"))}, openapiclient.pet{Cat: openapiclient.NewCat(openapiclient.cat_attr(\"CAT\"))}, openapiclient.pet{Cat: openapiclient.NewCat(openapiclient.cat_attr(\"CAT\"))}");
     }
 
     @Test
@@ -396,4 +396,24 @@ public void testAdditionalPropertiesWithoutGoMod() throws Exception {
         Path goSumFile = Paths.get(output + "/go.sum");
         TestUtils.assertFileNotExists(goSumFile);
     }
+
+    @Test
+    public void testInlineEnums_issue9567() throws Exception {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("go")
+                .setInputSpec("src/test/resources/bugs/issue_9567.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"))
+                .addAdditionalProperty(GoClientCodegen.WITH_GO_MOD, false);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(configurator.toClientOptInput()).generate();
+        System.out.println(files);
+        files.forEach(File::deleteOnExit);
+
+        Path enumFile = Paths.get(output + "/model_pet_status.go");
+        TestUtils.assertFileExists(enumFile);
+    }
 }
diff --git a/modules/openapi-generator/src/test/resources/bugs/issue_9567.yaml b/modules/openapi-generator/src/test/resources/bugs/issue_9567.yaml
new file mode 100644
index 000000000000..534645a661f7
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/bugs/issue_9567.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.1
+info:
+  title: TEST
+  description: |-
+    ## TEST
+  version: 1.0.0
+
+servers:
+  - url: /v3
+    description: Major version of service
+
+paths:
+  /agreements:
+    get:
+      operationId: readAPet
+      responses:
+        "200":
+          description: OK
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/Pet'
+components:
+  schemas:
+    Pet:
+      title: a Pet
+      description: A pet for sale in the pet store
+      type: object
+      properties:
+        status:
+          type: string
+          description: pet status in the store
+          enum:
+            - available
+            - pending
+            - sold
\ No newline at end of file
diff --git a/samples/client/echo_api/go-external-refs/.openapi-generator/FILES b/samples/client/echo_api/go-external-refs/.openapi-generator/FILES
index f1b5917aafdb..cca4453a3333 100644
--- a/samples/client/echo_api/go-external-refs/.openapi-generator/FILES
+++ b/samples/client/echo_api/go-external-refs/.openapi-generator/FILES
@@ -21,12 +21,15 @@ docs/HeaderAPI.md
 docs/NumberPropertiesOnly.md
 docs/PathAPI.md
 docs/Pet.md
+docs/PetStatus.md
 docs/Query.md
 docs/QueryAPI.md
+docs/QueryOutcomesInner.md
 docs/StringEnumRef.md
 docs/Tag.md
 docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md
 docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md
+docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
 git_push.sh
 go.mod
 go.sum
@@ -36,10 +39,13 @@ model_data_query.go
 model_default_value.go
 model_number_properties_only.go
 model_pet.go
+model_pet_status.go
 model_query.go
+model_query_outcomes_inner.go
 model_string_enum_ref.go
 model_tag.go
 model_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.go
 model_test_query_style_form_explode_true_array_string_query_object_parameter.go
+model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
 response.go
 utils.go
diff --git a/samples/client/echo_api/go-external-refs/README.md b/samples/client/echo_api/go-external-refs/README.md
index e5521aadc074..25801554ed0f 100644
--- a/samples/client/echo_api/go-external-refs/README.md
+++ b/samples/client/echo_api/go-external-refs/README.md
@@ -113,11 +113,14 @@ Class | Method | HTTP request | Description
  - [DefaultValue](docs/DefaultValue.md)
  - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md)
  - [Pet](docs/Pet.md)
+ - [PetStatus](docs/PetStatus.md)
  - [Query](docs/Query.md)
+ - [QueryOutcomesInner](docs/QueryOutcomesInner.md)
  - [StringEnumRef](docs/StringEnumRef.md)
  - [Tag](docs/Tag.md)
  - [TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter](docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md)
  - [TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter](docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md)
+ - [TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter](docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md)
 
 
 ## Documentation For Authorization
diff --git a/samples/client/echo_api/go-external-refs/api/openapi.yaml b/samples/client/echo_api/go-external-refs/api/openapi.yaml
index 3f804714a66d..b120a68033c2 100644
--- a/samples/client/echo_api/go-external-refs/api/openapi.yaml
+++ b/samples/client/echo_api/go-external-refs/api/openapi.yaml
@@ -35,11 +35,7 @@ paths:
         name: enum_nonref_string_path
         required: true
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: simple
       - explode: false
         in: path
@@ -127,11 +123,7 @@ paths:
         name: enum_nonref_string_header
         required: false
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: form
       - explode: true
         in: header
@@ -160,11 +152,7 @@ paths:
         name: enum_nonref_string_query
         required: false
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: form
       - explode: true
         in: query
@@ -695,12 +683,7 @@ components:
           xml:
             wrapped: true
         status:
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
+          $ref: "#/components/schemas/Pet_status"
       required:
       - name
       - photoUrls
@@ -728,11 +711,7 @@ components:
           - success
           - failure
           items:
-            enum:
-            - success
-            - failure
-            - unclassified
-            type: string
+            $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
           type: array
         array_string_default:
           default:
@@ -784,11 +763,7 @@ components:
           - SUCCESS
           - FAILURE
           items:
-            enum:
-            - SUCCESS
-            - FAILURE
-            - SKIPPED
-            type: string
+            $ref: "#/components/schemas/Query_outcomes_inner"
           type: array
       type: object
       x-parent: true
@@ -877,6 +852,25 @@ components:
       required:
       - files
       type: object
+    ? tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter
+    : enum:
+      - success
+      - failure
+      - unclassified
+      type: string
+    Pet_status:
+      description: pet status in the store
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
+    Query_outcomes_inner:
+      enum:
+      - SUCCESS
+      - FAILURE
+      - SKIPPED
+      type: string
   securitySchemes:
     http_auth:
       scheme: basic
diff --git a/samples/client/echo_api/go-external-refs/api_header.go b/samples/client/echo_api/go-external-refs/api_header.go
index 5984319dd2e4..6342c8737c24 100644
--- a/samples/client/echo_api/go-external-refs/api_header.go
+++ b/samples/client/echo_api/go-external-refs/api_header.go
@@ -29,7 +29,7 @@ type ApiTestHeaderIntegerBooleanStringEnumsRequest struct {
 	integerHeader *int32
 	booleanHeader *bool
 	stringHeader *string
-	enumNonrefStringHeader *string
+	enumNonrefStringHeader *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringHeader *StringEnumRef
 }
 
@@ -48,7 +48,7 @@ func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) StringHeader(stringHeader
 	return r
 }
 
-func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) EnumNonrefStringHeader(enumNonrefStringHeader string) ApiTestHeaderIntegerBooleanStringEnumsRequest {
+func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) EnumNonrefStringHeader(enumNonrefStringHeader TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) ApiTestHeaderIntegerBooleanStringEnumsRequest {
 	r.enumNonrefStringHeader = &enumNonrefStringHeader
 	return r
 }
diff --git a/samples/client/echo_api/go-external-refs/api_path.go b/samples/client/echo_api/go-external-refs/api_path.go
index 095605512a0c..c6162b5a21e6 100644
--- a/samples/client/echo_api/go-external-refs/api_path.go
+++ b/samples/client/echo_api/go-external-refs/api_path.go
@@ -29,7 +29,7 @@ type ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefSt
 	ApiService *PathAPIService
 	pathString string
 	pathInteger int32
-	enumNonrefStringPath string
+	enumNonrefStringPath TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringPath StringEnumRef
 }
 
@@ -49,7 +49,7 @@ Test path parameter(s)
  @param enumRefStringPath
  @return ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest
 */
-func (a *PathAPIService) TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(ctx context.Context, pathString string, pathInteger int32, enumNonrefStringPath string, enumRefStringPath StringEnumRef) ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest {
+func (a *PathAPIService) TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(ctx context.Context, pathString string, pathInteger int32, enumNonrefStringPath TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, enumRefStringPath StringEnumRef) ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest {
 	return ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest{
 		ApiService: a,
 		ctx: ctx,
diff --git a/samples/client/echo_api/go-external-refs/api_query.go b/samples/client/echo_api/go-external-refs/api_query.go
index bad8fb08f393..ac9c0efe65c6 100644
--- a/samples/client/echo_api/go-external-refs/api_query.go
+++ b/samples/client/echo_api/go-external-refs/api_query.go
@@ -27,11 +27,11 @@ type QueryAPIService service
 type ApiTestEnumRefStringRequest struct {
 	ctx context.Context
 	ApiService *QueryAPIService
-	enumNonrefStringQuery *string
+	enumNonrefStringQuery *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringQuery *StringEnumRef
 }
 
-func (r ApiTestEnumRefStringRequest) EnumNonrefStringQuery(enumNonrefStringQuery string) ApiTestEnumRefStringRequest {
+func (r ApiTestEnumRefStringRequest) EnumNonrefStringQuery(enumNonrefStringQuery TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) ApiTestEnumRefStringRequest {
 	r.enumNonrefStringQuery = &enumNonrefStringQuery
 	return r
 }
diff --git a/samples/client/echo_api/go-external-refs/docs/DefaultValue.md b/samples/client/echo_api/go-external-refs/docs/DefaultValue.md
index c6469d1db9a9..3b10c1043799 100644
--- a/samples/client/echo_api/go-external-refs/docs/DefaultValue.md
+++ b/samples/client/echo_api/go-external-refs/docs/DefaultValue.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) |  | [optional] [default to ["success","failure"]]
-**ArrayStringEnumDefault** | Pointer to **[]string** |  | [optional] [default to ["success","failure"]]
+**ArrayStringEnumDefault** | Pointer to [**[]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | [optional] [default to ["success","failure"]]
 **ArrayStringDefault** | Pointer to **[]string** |  | [optional] [default to ["failure","skipped"]]
 **ArrayIntegerDefault** | Pointer to **[]int32** |  | [optional] [default to [1,3]]
 **ArrayString** | Pointer to **[]string** |  | [optional] 
@@ -59,20 +59,20 @@ HasArrayStringEnumRefDefault returns a boolean if a field has been set.
 
 ### GetArrayStringEnumDefault
 
-`func (o *DefaultValue) GetArrayStringEnumDefault() []string`
+`func (o *DefaultValue) GetArrayStringEnumDefault() []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter`
 
 GetArrayStringEnumDefault returns the ArrayStringEnumDefault field if non-nil, zero value otherwise.
 
 ### GetArrayStringEnumDefaultOk
 
-`func (o *DefaultValue) GetArrayStringEnumDefaultOk() (*[]string, bool)`
+`func (o *DefaultValue) GetArrayStringEnumDefaultOk() (*[]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, bool)`
 
 GetArrayStringEnumDefaultOk returns a tuple with the ArrayStringEnumDefault field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetArrayStringEnumDefault
 
-`func (o *DefaultValue) SetArrayStringEnumDefault(v []string)`
+`func (o *DefaultValue) SetArrayStringEnumDefault(v []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter)`
 
 SetArrayStringEnumDefault sets ArrayStringEnumDefault field to given value.
 
diff --git a/samples/client/echo_api/go-external-refs/docs/HeaderAPI.md b/samples/client/echo_api/go-external-refs/docs/HeaderAPI.md
index 859a1f9dd40f..7bc39bdaa3d6 100644
--- a/samples/client/echo_api/go-external-refs/docs/HeaderAPI.md
+++ b/samples/client/echo_api/go-external-refs/docs/HeaderAPI.md
@@ -32,7 +32,7 @@ func main() {
 	integerHeader := int32(56) // int32 |  (optional)
 	booleanHeader := true // bool |  (optional)
 	stringHeader := "stringHeader_example" // string |  (optional)
-	enumNonrefStringHeader := "enumNonrefStringHeader_example" // string |  (optional)
+	enumNonrefStringHeader := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter |  (optional)
 	enumRefStringHeader := openapiclient.StringEnumRef("success") // StringEnumRef |  (optional)
 
 	configuration := openapiclient.NewConfiguration()
@@ -61,7 +61,7 @@ Name | Type | Description  | Notes
  **integerHeader** | **int32** |  | 
  **booleanHeader** | **bool** |  | 
  **stringHeader** | **string** |  | 
- **enumNonrefStringHeader** | **string** |  | 
+ **enumNonrefStringHeader** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | 
  **enumRefStringHeader** | [**StringEnumRef**](StringEnumRef.md) |  | 
 
 ### Return type
diff --git a/samples/client/echo_api/go-external-refs/docs/PathAPI.md b/samples/client/echo_api/go-external-refs/docs/PathAPI.md
index 2ae33bb6e96a..ab74634347c5 100644
--- a/samples/client/echo_api/go-external-refs/docs/PathAPI.md
+++ b/samples/client/echo_api/go-external-refs/docs/PathAPI.md
@@ -31,7 +31,7 @@ import (
 func main() {
 	pathString := "pathString_example" // string | 
 	pathInteger := int32(56) // int32 | 
-	enumNonrefStringPath := "enumNonrefStringPath_example" // string | 
+	enumNonrefStringPath := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter | 
 	enumRefStringPath := openapiclient.StringEnumRef("success") // StringEnumRef | 
 
 	configuration := openapiclient.NewConfiguration()
@@ -54,7 +54,7 @@ Name | Type | Description  | Notes
 **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc.
 **pathString** | **string** |  | 
 **pathInteger** | **int32** |  | 
-**enumNonrefStringPath** | **string** |  | 
+**enumNonrefStringPath** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](.md) |  | 
 **enumRefStringPath** | [**StringEnumRef**](.md) |  | 
 
 ### Other Parameters
diff --git a/samples/client/echo_api/go-external-refs/docs/Pet.md b/samples/client/echo_api/go-external-refs/docs/Pet.md
index 4887d2c69dde..a6532846b866 100644
--- a/samples/client/echo_api/go-external-refs/docs/Pet.md
+++ b/samples/client/echo_api/go-external-refs/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
 **PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | Pointer to **string** | pet status in the store | [optional] 
+**Status** | Pointer to [**PetStatus**](PetStatus.md) |  | [optional] 
 
 ## Methods
 
@@ -147,20 +147,20 @@ HasTags returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Pet) GetStatus() string`
+`func (o *Pet) GetStatus() PetStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Pet) GetStatusOk() (*string, bool)`
+`func (o *Pet) GetStatusOk() (*PetStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Pet) SetStatus(v string)`
+`func (o *Pet) SetStatus(v PetStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/client/echo_api/go-external-refs/docs/PetStatus.md b/samples/client/echo_api/go-external-refs/docs/PetStatus.md
new file mode 100644
index 000000000000..9b41cdb3b685
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/docs/PetStatus.md
@@ -0,0 +1,15 @@
+# PetStatus
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/echo_api/go-external-refs/docs/Query.md b/samples/client/echo_api/go-external-refs/docs/Query.md
index 2216bdeabdae..adf1ea210247 100644
--- a/samples/client/echo_api/go-external-refs/docs/Query.md
+++ b/samples/client/echo_api/go-external-refs/docs/Query.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** | Query | [optional] 
-**Outcomes** | Pointer to **[]string** |  | [optional] [default to ["SUCCESS","FAILURE"]]
+**Outcomes** | Pointer to [**[]QueryOutcomesInner**](QueryOutcomesInner.md) |  | [optional] [default to ["SUCCESS","FAILURE"]]
 
 ## Methods
 
@@ -53,20 +53,20 @@ HasId returns a boolean if a field has been set.
 
 ### GetOutcomes
 
-`func (o *Query) GetOutcomes() []string`
+`func (o *Query) GetOutcomes() []QueryOutcomesInner`
 
 GetOutcomes returns the Outcomes field if non-nil, zero value otherwise.
 
 ### GetOutcomesOk
 
-`func (o *Query) GetOutcomesOk() (*[]string, bool)`
+`func (o *Query) GetOutcomesOk() (*[]QueryOutcomesInner, bool)`
 
 GetOutcomesOk returns a tuple with the Outcomes field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetOutcomes
 
-`func (o *Query) SetOutcomes(v []string)`
+`func (o *Query) SetOutcomes(v []QueryOutcomesInner)`
 
 SetOutcomes sets Outcomes field to given value.
 
diff --git a/samples/client/echo_api/go-external-refs/docs/QueryAPI.md b/samples/client/echo_api/go-external-refs/docs/QueryAPI.md
index a62e1eb6bbcf..21400cea0eb4 100644
--- a/samples/client/echo_api/go-external-refs/docs/QueryAPI.md
+++ b/samples/client/echo_api/go-external-refs/docs/QueryAPI.md
@@ -38,7 +38,7 @@ import (
 )
 
 func main() {
-	enumNonrefStringQuery := "enumNonrefStringQuery_example" // string |  (optional)
+	enumNonrefStringQuery := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter |  (optional)
 	enumRefStringQuery := openapiclient.StringEnumRef("success") // StringEnumRef |  (optional)
 
 	configuration := openapiclient.NewConfiguration()
@@ -64,7 +64,7 @@ Other parameters are passed through a pointer to a apiTestEnumRefStringRequest s
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumNonrefStringQuery** | **string** |  | 
+ **enumNonrefStringQuery** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | 
  **enumRefStringQuery** | [**StringEnumRef**](StringEnumRef.md) |  | 
 
 ### Return type
diff --git a/samples/client/echo_api/go-external-refs/docs/QueryOutcomesInner.md b/samples/client/echo_api/go-external-refs/docs/QueryOutcomesInner.md
new file mode 100644
index 000000000000..70a7aa223e7c
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/docs/QueryOutcomesInner.md
@@ -0,0 +1,15 @@
+# QueryOutcomesInner
+
+## Enum
+
+
+* `SUCCESS` (value: `"SUCCESS"`)
+
+* `FAILURE` (value: `"FAILURE"`)
+
+* `SKIPPED` (value: `"SKIPPED"`)
+
+
+[[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/echo_api/go-external-refs/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md b/samples/client/echo_api/go-external-refs/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
new file mode 100644
index 000000000000..f2037a94e21a
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
@@ -0,0 +1,15 @@
+# TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+
+## Enum
+
+
+* `SUCCESS` (value: `"success"`)
+
+* `FAILURE` (value: `"failure"`)
+
+* `UNCLASSIFIED` (value: `"unclassified"`)
+
+
+[[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/echo_api/go-external-refs/model_default_value.go b/samples/client/echo_api/go-external-refs/model_default_value.go
index 48d42bfe77b9..421f830d2af2 100644
--- a/samples/client/echo_api/go-external-refs/model_default_value.go
+++ b/samples/client/echo_api/go-external-refs/model_default_value.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &DefaultValue{}
 // DefaultValue to test the default value of properties
 type DefaultValue struct {
 	ArrayStringEnumRefDefault []StringEnumRef `json:"array_string_enum_ref_default,omitempty"`
-	ArrayStringEnumDefault []string `json:"array_string_enum_default,omitempty"`
+	ArrayStringEnumDefault []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter `json:"array_string_enum_default,omitempty"`
 	ArrayStringDefault []string `json:"array_string_default,omitempty"`
 	ArrayIntegerDefault []int32 `json:"array_integer_default,omitempty"`
 	ArrayString []string `json:"array_string,omitempty"`
@@ -80,9 +80,9 @@ func (o *DefaultValue) SetArrayStringEnumRefDefault(v []StringEnumRef) {
 }
 
 // GetArrayStringEnumDefault returns the ArrayStringEnumDefault field value if set, zero value otherwise.
-func (o *DefaultValue) GetArrayStringEnumDefault() []string {
+func (o *DefaultValue) GetArrayStringEnumDefault() []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
 	if o == nil || IsNil(o.ArrayStringEnumDefault) {
-		var ret []string
+		var ret []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 		return ret
 	}
 	return o.ArrayStringEnumDefault
@@ -90,7 +90,7 @@ func (o *DefaultValue) GetArrayStringEnumDefault() []string {
 
 // GetArrayStringEnumDefaultOk returns a tuple with the ArrayStringEnumDefault field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *DefaultValue) GetArrayStringEnumDefaultOk() ([]string, bool) {
+func (o *DefaultValue) GetArrayStringEnumDefaultOk() ([]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, bool) {
 	if o == nil || IsNil(o.ArrayStringEnumDefault) {
 		return nil, false
 	}
@@ -106,8 +106,8 @@ func (o *DefaultValue) HasArrayStringEnumDefault() bool {
 	return false
 }
 
-// SetArrayStringEnumDefault gets a reference to the given []string and assigns it to the ArrayStringEnumDefault field.
-func (o *DefaultValue) SetArrayStringEnumDefault(v []string) {
+// SetArrayStringEnumDefault gets a reference to the given []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter and assigns it to the ArrayStringEnumDefault field.
+func (o *DefaultValue) SetArrayStringEnumDefault(v []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) {
 	o.ArrayStringEnumDefault = v
 }
 
diff --git a/samples/client/echo_api/go-external-refs/model_pet.go b/samples/client/echo_api/go-external-refs/model_pet.go
index 13f24706dfd5..d1d99ba3ebc1 100644
--- a/samples/client/echo_api/go-external-refs/model_pet.go
+++ b/samples/client/echo_api/go-external-refs/model_pet.go
@@ -27,8 +27,7 @@ type Pet struct {
 	Category *Category `json:"category,omitempty"`
 	PhotoUrls []string `json:"photoUrls"`
 	Tags []Tag `json:"tags,omitempty"`
-	// pet status in the store
-	Status *string `json:"status,omitempty"`
+	Status *PetStatus `json:"status,omitempty"`
 }
 
 type _Pet Pet
@@ -197,9 +196,9 @@ func (o *Pet) SetTags(v []Tag) {
 }
 
 // GetStatus returns the Status field value if set, zero value otherwise.
-func (o *Pet) GetStatus() string {
+func (o *Pet) GetStatus() PetStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret PetStatus
 		return ret
 	}
 	return *o.Status
@@ -207,7 +206,7 @@ func (o *Pet) GetStatus() string {
 
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Pet) GetStatusOk() (*string, bool) {
+func (o *Pet) GetStatusOk() (*PetStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -223,8 +222,8 @@ func (o *Pet) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
-func (o *Pet) SetStatus(v string) {
+// SetStatus gets a reference to the given PetStatus and assigns it to the Status field.
+func (o *Pet) SetStatus(v PetStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/client/echo_api/go-external-refs/model_pet_status.go b/samples/client/echo_api/go-external-refs/model_pet_status.go
new file mode 100644
index 000000000000..6c0462d9f665
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/model_pet_status.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// PetStatus pet status in the store
+type PetStatus string
+
+// List of Pet_status
+const (
+	AVAILABLE PetStatus = "available"
+	PENDING PetStatus = "pending"
+	SOLD PetStatus = "sold"
+)
+
+// All allowed values of PetStatus enum
+var AllowedPetStatusEnumValues = []PetStatus{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *PetStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := PetStatus(value)
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid PetStatus", value)
+}
+
+// NewPetStatusFromValue returns a pointer to a valid PetStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewPetStatusFromValue(v string) (*PetStatus, error) {
+	ev := PetStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for PetStatus: valid values are %v", v, AllowedPetStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v PetStatus) IsValid() bool {
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Pet_status value
+func (v PetStatus) Ptr() *PetStatus {
+	return &v
+}
+
+type NullablePetStatus struct {
+	value *PetStatus
+	isSet bool
+}
+
+func (v NullablePetStatus) Get() *PetStatus {
+	return v.value
+}
+
+func (v *NullablePetStatus) Set(val *PetStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePetStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePetStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePetStatus(val *PetStatus) *NullablePetStatus {
+	return &NullablePetStatus{value: val, isSet: true}
+}
+
+func (v NullablePetStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePetStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/echo_api/go-external-refs/model_query.go b/samples/client/echo_api/go-external-refs/model_query.go
index 653e18c8300b..d34768950d45 100644
--- a/samples/client/echo_api/go-external-refs/model_query.go
+++ b/samples/client/echo_api/go-external-refs/model_query.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &Query{}
 type Query struct {
 	// Query
 	Id *int64 `json:"id,omitempty"`
-	Outcomes []string `json:"outcomes,omitempty"`
+	Outcomes []QueryOutcomesInner `json:"outcomes,omitempty"`
 }
 
 // NewQuery instantiates a new Query object
@@ -75,9 +75,9 @@ func (o *Query) SetId(v int64) {
 }
 
 // GetOutcomes returns the Outcomes field value if set, zero value otherwise.
-func (o *Query) GetOutcomes() []string {
+func (o *Query) GetOutcomes() []QueryOutcomesInner {
 	if o == nil || IsNil(o.Outcomes) {
-		var ret []string
+		var ret []QueryOutcomesInner
 		return ret
 	}
 	return o.Outcomes
@@ -85,7 +85,7 @@ func (o *Query) GetOutcomes() []string {
 
 // GetOutcomesOk returns a tuple with the Outcomes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Query) GetOutcomesOk() ([]string, bool) {
+func (o *Query) GetOutcomesOk() ([]QueryOutcomesInner, bool) {
 	if o == nil || IsNil(o.Outcomes) {
 		return nil, false
 	}
@@ -101,8 +101,8 @@ func (o *Query) HasOutcomes() bool {
 	return false
 }
 
-// SetOutcomes gets a reference to the given []string and assigns it to the Outcomes field.
-func (o *Query) SetOutcomes(v []string) {
+// SetOutcomes gets a reference to the given []QueryOutcomesInner and assigns it to the Outcomes field.
+func (o *Query) SetOutcomes(v []QueryOutcomesInner) {
 	o.Outcomes = v
 }
 
diff --git a/samples/client/echo_api/go-external-refs/model_query_outcomes_inner.go b/samples/client/echo_api/go-external-refs/model_query_outcomes_inner.go
new file mode 100644
index 000000000000..cd924d61c2e8
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/model_query_outcomes_inner.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// QueryOutcomesInner the model 'QueryOutcomesInner'
+type QueryOutcomesInner string
+
+// List of Query_outcomes_inner
+const (
+	SUCCESS QueryOutcomesInner = "SUCCESS"
+	FAILURE QueryOutcomesInner = "FAILURE"
+	SKIPPED QueryOutcomesInner = "SKIPPED"
+)
+
+// All allowed values of QueryOutcomesInner enum
+var AllowedQueryOutcomesInnerEnumValues = []QueryOutcomesInner{
+	"SUCCESS",
+	"FAILURE",
+	"SKIPPED",
+}
+
+func (v *QueryOutcomesInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := QueryOutcomesInner(value)
+	for _, existing := range AllowedQueryOutcomesInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid QueryOutcomesInner", value)
+}
+
+// NewQueryOutcomesInnerFromValue returns a pointer to a valid QueryOutcomesInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewQueryOutcomesInnerFromValue(v string) (*QueryOutcomesInner, error) {
+	ev := QueryOutcomesInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for QueryOutcomesInner: valid values are %v", v, AllowedQueryOutcomesInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v QueryOutcomesInner) IsValid() bool {
+	for _, existing := range AllowedQueryOutcomesInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Query_outcomes_inner value
+func (v QueryOutcomesInner) Ptr() *QueryOutcomesInner {
+	return &v
+}
+
+type NullableQueryOutcomesInner struct {
+	value *QueryOutcomesInner
+	isSet bool
+}
+
+func (v NullableQueryOutcomesInner) Get() *QueryOutcomesInner {
+	return v.value
+}
+
+func (v *NullableQueryOutcomesInner) Set(val *QueryOutcomesInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableQueryOutcomesInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableQueryOutcomesInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableQueryOutcomesInner(val *QueryOutcomesInner) *NullableQueryOutcomesInner {
+	return &NullableQueryOutcomesInner{value: val, isSet: true}
+}
+
+func (v NullableQueryOutcomesInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableQueryOutcomesInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/echo_api/go-external-refs/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go b/samples/client/echo_api/go-external-refs/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
new file mode 100644
index 000000000000..fb55a4199213
--- /dev/null
+++ b/samples/client/echo_api/go-external-refs/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter the model 'TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter'
+type TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter string
+
+// List of tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter
+const (
+	SUCCESS TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "success"
+	FAILURE TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "failure"
+	UNCLASSIFIED TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "unclassified"
+)
+
+// All allowed values of TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter enum
+var AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues = []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter{
+	"success",
+	"failure",
+	"unclassified",
+}
+
+func (v *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(value)
+	for _, existing := range AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter", value)
+}
+
+// NewTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterFromValue returns a pointer to a valid TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterFromValue(v string) (*TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, error) {
+	ev := TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter: valid values are %v", v, AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) IsValid() bool {
+	for _, existing := range AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter value
+func (v TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Ptr() *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return &v
+}
+
+type NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter struct {
+	value *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+	isSet bool
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Get() *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return v.value
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Set(val *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(val *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return &NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter{value: val, isSet: true}
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/echo_api/go/.openapi-generator/FILES b/samples/client/echo_api/go/.openapi-generator/FILES
index d72465c44e0b..7fac89e8655a 100644
--- a/samples/client/echo_api/go/.openapi-generator/FILES
+++ b/samples/client/echo_api/go/.openapi-generator/FILES
@@ -21,13 +21,16 @@ docs/HeaderAPI.md
 docs/NumberPropertiesOnly.md
 docs/PathAPI.md
 docs/Pet.md
+docs/PetStatus.md
 docs/Query.md
 docs/QueryAPI.md
+docs/QueryOutcomesInner.md
 docs/StringEnumRef.md
 docs/Tag.md
 docs/TestFormObjectMultipartRequestMarker.md
 docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md
 docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md
+docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
 git_push.sh
 go.mod
 go.sum
@@ -37,11 +40,14 @@ model_data_query.go
 model_default_value.go
 model_number_properties_only.go
 model_pet.go
+model_pet_status.go
 model_query.go
+model_query_outcomes_inner.go
 model_string_enum_ref.go
 model_tag.go
 model_test_form_object_multipart_request_marker.go
 model_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.go
 model_test_query_style_form_explode_true_array_string_query_object_parameter.go
+model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
 response.go
 utils.go
diff --git a/samples/client/echo_api/go/README.md b/samples/client/echo_api/go/README.md
index 741605cbf656..8f6cef249dfd 100644
--- a/samples/client/echo_api/go/README.md
+++ b/samples/client/echo_api/go/README.md
@@ -115,12 +115,15 @@ Class | Method | HTTP request | Description
  - [DefaultValue](docs/DefaultValue.md)
  - [NumberPropertiesOnly](docs/NumberPropertiesOnly.md)
  - [Pet](docs/Pet.md)
+ - [PetStatus](docs/PetStatus.md)
  - [Query](docs/Query.md)
+ - [QueryOutcomesInner](docs/QueryOutcomesInner.md)
  - [StringEnumRef](docs/StringEnumRef.md)
  - [Tag](docs/Tag.md)
  - [TestFormObjectMultipartRequestMarker](docs/TestFormObjectMultipartRequestMarker.md)
  - [TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter](docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md)
  - [TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter](docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md)
+ - [TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter](docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md)
 
 
 ## Documentation For Authorization
diff --git a/samples/client/echo_api/go/api/openapi.yaml b/samples/client/echo_api/go/api/openapi.yaml
index cce790b6a1ad..3b861f79472e 100644
--- a/samples/client/echo_api/go/api/openapi.yaml
+++ b/samples/client/echo_api/go/api/openapi.yaml
@@ -35,11 +35,7 @@ paths:
         name: enum_nonref_string_path
         required: true
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: simple
       - explode: false
         in: path
@@ -146,11 +142,7 @@ paths:
         name: enum_nonref_string_header
         required: false
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: form
       - explode: true
         in: header
@@ -179,11 +171,7 @@ paths:
         name: enum_nonref_string_query
         required: false
         schema:
-          enum:
-          - success
-          - failure
-          - unclassified
-          type: string
+          $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
         style: form
       - explode: true
         in: query
@@ -734,12 +722,7 @@ components:
           xml:
             wrapped: true
         status:
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
+          $ref: "#/components/schemas/Pet_status"
       required:
       - name
       - photoUrls
@@ -767,11 +750,7 @@ components:
           - success
           - failure
           items:
-            enum:
-            - success
-            - failure
-            - unclassified
-            type: string
+            $ref: "#/components/schemas/tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter"
           type: array
         array_string_default:
           default:
@@ -823,11 +802,7 @@ components:
           - SUCCESS
           - FAILURE
           items:
-            enum:
-            - SUCCESS
-            - FAILURE
-            - SKIPPED
-            type: string
+            $ref: "#/components/schemas/Query_outcomes_inner"
           type: array
       type: object
       x-parent: true
@@ -860,6 +835,12 @@ components:
           minimum: 0.8
           type: number
       type: object
+    ? tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter
+    : enum:
+      - success
+      - failure
+      - unclassified
+      type: string
     test_form_integer_boolean_string_request:
       properties:
         integer_form:
@@ -928,6 +909,19 @@ components:
       required:
       - files
       type: object
+    Pet_status:
+      description: pet status in the store
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
+    Query_outcomes_inner:
+      enum:
+      - SUCCESS
+      - FAILURE
+      - SKIPPED
+      type: string
   securitySchemes:
     http_auth:
       scheme: basic
diff --git a/samples/client/echo_api/go/api_header.go b/samples/client/echo_api/go/api_header.go
index 5984319dd2e4..6342c8737c24 100644
--- a/samples/client/echo_api/go/api_header.go
+++ b/samples/client/echo_api/go/api_header.go
@@ -29,7 +29,7 @@ type ApiTestHeaderIntegerBooleanStringEnumsRequest struct {
 	integerHeader *int32
 	booleanHeader *bool
 	stringHeader *string
-	enumNonrefStringHeader *string
+	enumNonrefStringHeader *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringHeader *StringEnumRef
 }
 
@@ -48,7 +48,7 @@ func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) StringHeader(stringHeader
 	return r
 }
 
-func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) EnumNonrefStringHeader(enumNonrefStringHeader string) ApiTestHeaderIntegerBooleanStringEnumsRequest {
+func (r ApiTestHeaderIntegerBooleanStringEnumsRequest) EnumNonrefStringHeader(enumNonrefStringHeader TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) ApiTestHeaderIntegerBooleanStringEnumsRequest {
 	r.enumNonrefStringHeader = &enumNonrefStringHeader
 	return r
 }
diff --git a/samples/client/echo_api/go/api_path.go b/samples/client/echo_api/go/api_path.go
index 095605512a0c..c6162b5a21e6 100644
--- a/samples/client/echo_api/go/api_path.go
+++ b/samples/client/echo_api/go/api_path.go
@@ -29,7 +29,7 @@ type ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefSt
 	ApiService *PathAPIService
 	pathString string
 	pathInteger int32
-	enumNonrefStringPath string
+	enumNonrefStringPath TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringPath StringEnumRef
 }
 
@@ -49,7 +49,7 @@ Test path parameter(s)
  @param enumRefStringPath
  @return ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest
 */
-func (a *PathAPIService) TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(ctx context.Context, pathString string, pathInteger int32, enumNonrefStringPath string, enumRefStringPath StringEnumRef) ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest {
+func (a *PathAPIService) TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(ctx context.Context, pathString string, pathInteger int32, enumNonrefStringPath TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, enumRefStringPath StringEnumRef) ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest {
 	return ApiTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequest{
 		ApiService: a,
 		ctx: ctx,
diff --git a/samples/client/echo_api/go/api_query.go b/samples/client/echo_api/go/api_query.go
index bad8fb08f393..ac9c0efe65c6 100644
--- a/samples/client/echo_api/go/api_query.go
+++ b/samples/client/echo_api/go/api_query.go
@@ -27,11 +27,11 @@ type QueryAPIService service
 type ApiTestEnumRefStringRequest struct {
 	ctx context.Context
 	ApiService *QueryAPIService
-	enumNonrefStringQuery *string
+	enumNonrefStringQuery *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 	enumRefStringQuery *StringEnumRef
 }
 
-func (r ApiTestEnumRefStringRequest) EnumNonrefStringQuery(enumNonrefStringQuery string) ApiTestEnumRefStringRequest {
+func (r ApiTestEnumRefStringRequest) EnumNonrefStringQuery(enumNonrefStringQuery TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) ApiTestEnumRefStringRequest {
 	r.enumNonrefStringQuery = &enumNonrefStringQuery
 	return r
 }
diff --git a/samples/client/echo_api/go/docs/DefaultValue.md b/samples/client/echo_api/go/docs/DefaultValue.md
index c6469d1db9a9..3b10c1043799 100644
--- a/samples/client/echo_api/go/docs/DefaultValue.md
+++ b/samples/client/echo_api/go/docs/DefaultValue.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) |  | [optional] [default to ["success","failure"]]
-**ArrayStringEnumDefault** | Pointer to **[]string** |  | [optional] [default to ["success","failure"]]
+**ArrayStringEnumDefault** | Pointer to [**[]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | [optional] [default to ["success","failure"]]
 **ArrayStringDefault** | Pointer to **[]string** |  | [optional] [default to ["failure","skipped"]]
 **ArrayIntegerDefault** | Pointer to **[]int32** |  | [optional] [default to [1,3]]
 **ArrayString** | Pointer to **[]string** |  | [optional] 
@@ -59,20 +59,20 @@ HasArrayStringEnumRefDefault returns a boolean if a field has been set.
 
 ### GetArrayStringEnumDefault
 
-`func (o *DefaultValue) GetArrayStringEnumDefault() []string`
+`func (o *DefaultValue) GetArrayStringEnumDefault() []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter`
 
 GetArrayStringEnumDefault returns the ArrayStringEnumDefault field if non-nil, zero value otherwise.
 
 ### GetArrayStringEnumDefaultOk
 
-`func (o *DefaultValue) GetArrayStringEnumDefaultOk() (*[]string, bool)`
+`func (o *DefaultValue) GetArrayStringEnumDefaultOk() (*[]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, bool)`
 
 GetArrayStringEnumDefaultOk returns a tuple with the ArrayStringEnumDefault field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetArrayStringEnumDefault
 
-`func (o *DefaultValue) SetArrayStringEnumDefault(v []string)`
+`func (o *DefaultValue) SetArrayStringEnumDefault(v []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter)`
 
 SetArrayStringEnumDefault sets ArrayStringEnumDefault field to given value.
 
diff --git a/samples/client/echo_api/go/docs/HeaderAPI.md b/samples/client/echo_api/go/docs/HeaderAPI.md
index 859a1f9dd40f..7bc39bdaa3d6 100644
--- a/samples/client/echo_api/go/docs/HeaderAPI.md
+++ b/samples/client/echo_api/go/docs/HeaderAPI.md
@@ -32,7 +32,7 @@ func main() {
 	integerHeader := int32(56) // int32 |  (optional)
 	booleanHeader := true // bool |  (optional)
 	stringHeader := "stringHeader_example" // string |  (optional)
-	enumNonrefStringHeader := "enumNonrefStringHeader_example" // string |  (optional)
+	enumNonrefStringHeader := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter |  (optional)
 	enumRefStringHeader := openapiclient.StringEnumRef("success") // StringEnumRef |  (optional)
 
 	configuration := openapiclient.NewConfiguration()
@@ -61,7 +61,7 @@ Name | Type | Description  | Notes
  **integerHeader** | **int32** |  | 
  **booleanHeader** | **bool** |  | 
  **stringHeader** | **string** |  | 
- **enumNonrefStringHeader** | **string** |  | 
+ **enumNonrefStringHeader** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | 
  **enumRefStringHeader** | [**StringEnumRef**](StringEnumRef.md) |  | 
 
 ### Return type
diff --git a/samples/client/echo_api/go/docs/PathAPI.md b/samples/client/echo_api/go/docs/PathAPI.md
index 2ae33bb6e96a..ab74634347c5 100644
--- a/samples/client/echo_api/go/docs/PathAPI.md
+++ b/samples/client/echo_api/go/docs/PathAPI.md
@@ -31,7 +31,7 @@ import (
 func main() {
 	pathString := "pathString_example" // string | 
 	pathInteger := int32(56) // int32 | 
-	enumNonrefStringPath := "enumNonrefStringPath_example" // string | 
+	enumNonrefStringPath := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter | 
 	enumRefStringPath := openapiclient.StringEnumRef("success") // StringEnumRef | 
 
 	configuration := openapiclient.NewConfiguration()
@@ -54,7 +54,7 @@ Name | Type | Description  | Notes
 **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc.
 **pathString** | **string** |  | 
 **pathInteger** | **int32** |  | 
-**enumNonrefStringPath** | **string** |  | 
+**enumNonrefStringPath** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](.md) |  | 
 **enumRefStringPath** | [**StringEnumRef**](.md) |  | 
 
 ### Other Parameters
diff --git a/samples/client/echo_api/go/docs/Pet.md b/samples/client/echo_api/go/docs/Pet.md
index 4887d2c69dde..a6532846b866 100644
--- a/samples/client/echo_api/go/docs/Pet.md
+++ b/samples/client/echo_api/go/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **Category** | Pointer to [**Category**](Category.md) |  | [optional] 
 **PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | Pointer to **string** | pet status in the store | [optional] 
+**Status** | Pointer to [**PetStatus**](PetStatus.md) |  | [optional] 
 
 ## Methods
 
@@ -147,20 +147,20 @@ HasTags returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Pet) GetStatus() string`
+`func (o *Pet) GetStatus() PetStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Pet) GetStatusOk() (*string, bool)`
+`func (o *Pet) GetStatusOk() (*PetStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Pet) SetStatus(v string)`
+`func (o *Pet) SetStatus(v PetStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/client/echo_api/go/docs/PetStatus.md b/samples/client/echo_api/go/docs/PetStatus.md
new file mode 100644
index 000000000000..9b41cdb3b685
--- /dev/null
+++ b/samples/client/echo_api/go/docs/PetStatus.md
@@ -0,0 +1,15 @@
+# PetStatus
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/echo_api/go/docs/Query.md b/samples/client/echo_api/go/docs/Query.md
index 2216bdeabdae..adf1ea210247 100644
--- a/samples/client/echo_api/go/docs/Query.md
+++ b/samples/client/echo_api/go/docs/Query.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | Pointer to **int64** | Query | [optional] 
-**Outcomes** | Pointer to **[]string** |  | [optional] [default to ["SUCCESS","FAILURE"]]
+**Outcomes** | Pointer to [**[]QueryOutcomesInner**](QueryOutcomesInner.md) |  | [optional] [default to ["SUCCESS","FAILURE"]]
 
 ## Methods
 
@@ -53,20 +53,20 @@ HasId returns a boolean if a field has been set.
 
 ### GetOutcomes
 
-`func (o *Query) GetOutcomes() []string`
+`func (o *Query) GetOutcomes() []QueryOutcomesInner`
 
 GetOutcomes returns the Outcomes field if non-nil, zero value otherwise.
 
 ### GetOutcomesOk
 
-`func (o *Query) GetOutcomesOk() (*[]string, bool)`
+`func (o *Query) GetOutcomesOk() (*[]QueryOutcomesInner, bool)`
 
 GetOutcomesOk returns a tuple with the Outcomes field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetOutcomes
 
-`func (o *Query) SetOutcomes(v []string)`
+`func (o *Query) SetOutcomes(v []QueryOutcomesInner)`
 
 SetOutcomes sets Outcomes field to given value.
 
diff --git a/samples/client/echo_api/go/docs/QueryAPI.md b/samples/client/echo_api/go/docs/QueryAPI.md
index a62e1eb6bbcf..21400cea0eb4 100644
--- a/samples/client/echo_api/go/docs/QueryAPI.md
+++ b/samples/client/echo_api/go/docs/QueryAPI.md
@@ -38,7 +38,7 @@ import (
 )
 
 func main() {
-	enumNonrefStringQuery := "enumNonrefStringQuery_example" // string |  (optional)
+	enumNonrefStringQuery := openapiclient.tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter("success") // TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter |  (optional)
 	enumRefStringQuery := openapiclient.StringEnumRef("success") // StringEnumRef |  (optional)
 
 	configuration := openapiclient.NewConfiguration()
@@ -64,7 +64,7 @@ Other parameters are passed through a pointer to a apiTestEnumRefStringRequest s
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumNonrefStringQuery** | **string** |  | 
+ **enumNonrefStringQuery** | [**TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter**](TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md) |  | 
  **enumRefStringQuery** | [**StringEnumRef**](StringEnumRef.md) |  | 
 
 ### Return type
diff --git a/samples/client/echo_api/go/docs/QueryOutcomesInner.md b/samples/client/echo_api/go/docs/QueryOutcomesInner.md
new file mode 100644
index 000000000000..70a7aa223e7c
--- /dev/null
+++ b/samples/client/echo_api/go/docs/QueryOutcomesInner.md
@@ -0,0 +1,15 @@
+# QueryOutcomesInner
+
+## Enum
+
+
+* `SUCCESS` (value: `"SUCCESS"`)
+
+* `FAILURE` (value: `"FAILURE"`)
+
+* `SKIPPED` (value: `"SKIPPED"`)
+
+
+[[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/echo_api/go/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md b/samples/client/echo_api/go/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
new file mode 100644
index 000000000000..f2037a94e21a
--- /dev/null
+++ b/samples/client/echo_api/go/docs/TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter.md
@@ -0,0 +1,15 @@
+# TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+
+## Enum
+
+
+* `SUCCESS` (value: `"success"`)
+
+* `FAILURE` (value: `"failure"`)
+
+* `UNCLASSIFIED` (value: `"unclassified"`)
+
+
+[[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/echo_api/go/model_default_value.go b/samples/client/echo_api/go/model_default_value.go
index 48d42bfe77b9..421f830d2af2 100644
--- a/samples/client/echo_api/go/model_default_value.go
+++ b/samples/client/echo_api/go/model_default_value.go
@@ -21,7 +21,7 @@ var _ MappedNullable = &DefaultValue{}
 // DefaultValue to test the default value of properties
 type DefaultValue struct {
 	ArrayStringEnumRefDefault []StringEnumRef `json:"array_string_enum_ref_default,omitempty"`
-	ArrayStringEnumDefault []string `json:"array_string_enum_default,omitempty"`
+	ArrayStringEnumDefault []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter `json:"array_string_enum_default,omitempty"`
 	ArrayStringDefault []string `json:"array_string_default,omitempty"`
 	ArrayIntegerDefault []int32 `json:"array_integer_default,omitempty"`
 	ArrayString []string `json:"array_string,omitempty"`
@@ -80,9 +80,9 @@ func (o *DefaultValue) SetArrayStringEnumRefDefault(v []StringEnumRef) {
 }
 
 // GetArrayStringEnumDefault returns the ArrayStringEnumDefault field value if set, zero value otherwise.
-func (o *DefaultValue) GetArrayStringEnumDefault() []string {
+func (o *DefaultValue) GetArrayStringEnumDefault() []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
 	if o == nil || IsNil(o.ArrayStringEnumDefault) {
-		var ret []string
+		var ret []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
 		return ret
 	}
 	return o.ArrayStringEnumDefault
@@ -90,7 +90,7 @@ func (o *DefaultValue) GetArrayStringEnumDefault() []string {
 
 // GetArrayStringEnumDefaultOk returns a tuple with the ArrayStringEnumDefault field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *DefaultValue) GetArrayStringEnumDefaultOk() ([]string, bool) {
+func (o *DefaultValue) GetArrayStringEnumDefaultOk() ([]TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, bool) {
 	if o == nil || IsNil(o.ArrayStringEnumDefault) {
 		return nil, false
 	}
@@ -106,8 +106,8 @@ func (o *DefaultValue) HasArrayStringEnumDefault() bool {
 	return false
 }
 
-// SetArrayStringEnumDefault gets a reference to the given []string and assigns it to the ArrayStringEnumDefault field.
-func (o *DefaultValue) SetArrayStringEnumDefault(v []string) {
+// SetArrayStringEnumDefault gets a reference to the given []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter and assigns it to the ArrayStringEnumDefault field.
+func (o *DefaultValue) SetArrayStringEnumDefault(v []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) {
 	o.ArrayStringEnumDefault = v
 }
 
diff --git a/samples/client/echo_api/go/model_pet.go b/samples/client/echo_api/go/model_pet.go
index 13f24706dfd5..d1d99ba3ebc1 100644
--- a/samples/client/echo_api/go/model_pet.go
+++ b/samples/client/echo_api/go/model_pet.go
@@ -27,8 +27,7 @@ type Pet struct {
 	Category *Category `json:"category,omitempty"`
 	PhotoUrls []string `json:"photoUrls"`
 	Tags []Tag `json:"tags,omitempty"`
-	// pet status in the store
-	Status *string `json:"status,omitempty"`
+	Status *PetStatus `json:"status,omitempty"`
 }
 
 type _Pet Pet
@@ -197,9 +196,9 @@ func (o *Pet) SetTags(v []Tag) {
 }
 
 // GetStatus returns the Status field value if set, zero value otherwise.
-func (o *Pet) GetStatus() string {
+func (o *Pet) GetStatus() PetStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret PetStatus
 		return ret
 	}
 	return *o.Status
@@ -207,7 +206,7 @@ func (o *Pet) GetStatus() string {
 
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Pet) GetStatusOk() (*string, bool) {
+func (o *Pet) GetStatusOk() (*PetStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -223,8 +222,8 @@ func (o *Pet) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
-func (o *Pet) SetStatus(v string) {
+// SetStatus gets a reference to the given PetStatus and assigns it to the Status field.
+func (o *Pet) SetStatus(v PetStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/client/echo_api/go/model_pet_status.go b/samples/client/echo_api/go/model_pet_status.go
new file mode 100644
index 000000000000..6c0462d9f665
--- /dev/null
+++ b/samples/client/echo_api/go/model_pet_status.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// PetStatus pet status in the store
+type PetStatus string
+
+// List of Pet_status
+const (
+	AVAILABLE PetStatus = "available"
+	PENDING PetStatus = "pending"
+	SOLD PetStatus = "sold"
+)
+
+// All allowed values of PetStatus enum
+var AllowedPetStatusEnumValues = []PetStatus{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *PetStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := PetStatus(value)
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid PetStatus", value)
+}
+
+// NewPetStatusFromValue returns a pointer to a valid PetStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewPetStatusFromValue(v string) (*PetStatus, error) {
+	ev := PetStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for PetStatus: valid values are %v", v, AllowedPetStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v PetStatus) IsValid() bool {
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Pet_status value
+func (v PetStatus) Ptr() *PetStatus {
+	return &v
+}
+
+type NullablePetStatus struct {
+	value *PetStatus
+	isSet bool
+}
+
+func (v NullablePetStatus) Get() *PetStatus {
+	return v.value
+}
+
+func (v *NullablePetStatus) Set(val *PetStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePetStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePetStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePetStatus(val *PetStatus) *NullablePetStatus {
+	return &NullablePetStatus{value: val, isSet: true}
+}
+
+func (v NullablePetStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePetStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/echo_api/go/model_query.go b/samples/client/echo_api/go/model_query.go
index 653e18c8300b..d34768950d45 100644
--- a/samples/client/echo_api/go/model_query.go
+++ b/samples/client/echo_api/go/model_query.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &Query{}
 type Query struct {
 	// Query
 	Id *int64 `json:"id,omitempty"`
-	Outcomes []string `json:"outcomes,omitempty"`
+	Outcomes []QueryOutcomesInner `json:"outcomes,omitempty"`
 }
 
 // NewQuery instantiates a new Query object
@@ -75,9 +75,9 @@ func (o *Query) SetId(v int64) {
 }
 
 // GetOutcomes returns the Outcomes field value if set, zero value otherwise.
-func (o *Query) GetOutcomes() []string {
+func (o *Query) GetOutcomes() []QueryOutcomesInner {
 	if o == nil || IsNil(o.Outcomes) {
-		var ret []string
+		var ret []QueryOutcomesInner
 		return ret
 	}
 	return o.Outcomes
@@ -85,7 +85,7 @@ func (o *Query) GetOutcomes() []string {
 
 // GetOutcomesOk returns a tuple with the Outcomes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Query) GetOutcomesOk() ([]string, bool) {
+func (o *Query) GetOutcomesOk() ([]QueryOutcomesInner, bool) {
 	if o == nil || IsNil(o.Outcomes) {
 		return nil, false
 	}
@@ -101,8 +101,8 @@ func (o *Query) HasOutcomes() bool {
 	return false
 }
 
-// SetOutcomes gets a reference to the given []string and assigns it to the Outcomes field.
-func (o *Query) SetOutcomes(v []string) {
+// SetOutcomes gets a reference to the given []QueryOutcomesInner and assigns it to the Outcomes field.
+func (o *Query) SetOutcomes(v []QueryOutcomesInner) {
 	o.Outcomes = v
 }
 
diff --git a/samples/client/echo_api/go/model_query_outcomes_inner.go b/samples/client/echo_api/go/model_query_outcomes_inner.go
new file mode 100644
index 000000000000..cd924d61c2e8
--- /dev/null
+++ b/samples/client/echo_api/go/model_query_outcomes_inner.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// QueryOutcomesInner the model 'QueryOutcomesInner'
+type QueryOutcomesInner string
+
+// List of Query_outcomes_inner
+const (
+	SUCCESS QueryOutcomesInner = "SUCCESS"
+	FAILURE QueryOutcomesInner = "FAILURE"
+	SKIPPED QueryOutcomesInner = "SKIPPED"
+)
+
+// All allowed values of QueryOutcomesInner enum
+var AllowedQueryOutcomesInnerEnumValues = []QueryOutcomesInner{
+	"SUCCESS",
+	"FAILURE",
+	"SKIPPED",
+}
+
+func (v *QueryOutcomesInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := QueryOutcomesInner(value)
+	for _, existing := range AllowedQueryOutcomesInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid QueryOutcomesInner", value)
+}
+
+// NewQueryOutcomesInnerFromValue returns a pointer to a valid QueryOutcomesInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewQueryOutcomesInnerFromValue(v string) (*QueryOutcomesInner, error) {
+	ev := QueryOutcomesInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for QueryOutcomesInner: valid values are %v", v, AllowedQueryOutcomesInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v QueryOutcomesInner) IsValid() bool {
+	for _, existing := range AllowedQueryOutcomesInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Query_outcomes_inner value
+func (v QueryOutcomesInner) Ptr() *QueryOutcomesInner {
+	return &v
+}
+
+type NullableQueryOutcomesInner struct {
+	value *QueryOutcomesInner
+	isSet bool
+}
+
+func (v NullableQueryOutcomesInner) Get() *QueryOutcomesInner {
+	return v.value
+}
+
+func (v *NullableQueryOutcomesInner) Set(val *QueryOutcomesInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableQueryOutcomesInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableQueryOutcomesInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableQueryOutcomesInner(val *QueryOutcomesInner) *NullableQueryOutcomesInner {
+	return &NullableQueryOutcomesInner{value: val, isSet: true}
+}
+
+func (v NullableQueryOutcomesInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableQueryOutcomesInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/echo_api/go/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go b/samples/client/echo_api/go/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
new file mode 100644
index 000000000000..fb55a4199213
--- /dev/null
+++ b/samples/client/echo_api/go/model_tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter.go
@@ -0,0 +1,114 @@
+/*
+Echo Server API
+
+Echo Server API
+
+API version: 0.1.0
+Contact: team@openapitools.org
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter the model 'TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter'
+type TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter string
+
+// List of tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter
+const (
+	SUCCESS TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "success"
+	FAILURE TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "failure"
+	UNCLASSIFIED TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter = "unclassified"
+)
+
+// All allowed values of TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter enum
+var AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues = []TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter{
+	"success",
+	"failure",
+	"unclassified",
+}
+
+func (v *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(value)
+	for _, existing := range AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter", value)
+}
+
+// NewTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterFromValue returns a pointer to a valid TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterFromValue(v string) (*TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter, error) {
+	ev := TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter: valid values are %v", v, AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) IsValid() bool {
+	for _, existing := range AllowedTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to tests_path_string__path_string__integer__path_integer___enum_nonref_string_path___enum_ref_string_path__enum_nonref_string_path_parameter value
+func (v TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Ptr() *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return &v
+}
+
+type NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter struct {
+	value *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter
+	isSet bool
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Get() *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return v.value
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Set(val *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter(val *TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter {
+	return &NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter{value: val, isSet: true}
+}
+
+func (v NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathEnumNonrefStringPathParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/.openapi-generator/FILES b/samples/client/others/go/allof_multiple_ref_and_discriminator/.openapi-generator/FILES
index a4d184b4dd83..9c80a27dffd4 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/.openapi-generator/FILES
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/.openapi-generator/FILES
@@ -6,12 +6,14 @@ client.go
 configuration.go
 docs/AdditionalData.md
 docs/BaseItem.md
+docs/BaseItemType.md
 docs/FinalItem.md
 git_push.sh
 go.mod
 go.sum
 model_additional_data.go
 model_base_item.go
+model_base_item_type.go
 model_final_item.go
 response.go
 utils.go
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/README.md b/samples/client/others/go/allof_multiple_ref_and_discriminator/README.md
index 137c12fc4920..db5d8619f80c 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/README.md
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/README.md
@@ -84,6 +84,7 @@ Class | Method | HTTP request | Description
 
  - [AdditionalData](docs/AdditionalData.md)
  - [BaseItem](docs/BaseItem.md)
+ - [BaseItemType](docs/BaseItemType.md)
  - [FinalItem](docs/FinalItem.md)
 
 
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/api/openapi.yaml b/samples/client/others/go/allof_multiple_ref_and_discriminator/api/openapi.yaml
index 03185cd2e7dd..268de1152eff 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/api/openapi.yaml
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/api/openapi.yaml
@@ -21,10 +21,7 @@ components:
         title:
           type: string
         type:
-          enum:
-          - FINAL
-          example: FINAL
-          type: string
+          $ref: "#/components/schemas/base_item_type"
       required:
       - title
       - type
@@ -54,3 +51,8 @@ components:
       - totalPrice
       - unitPrice
       type: object
+    base_item_type:
+      enum:
+      - FINAL
+      example: FINAL
+      type: string
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItem.md b/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItem.md
index cccf13906647..a002c98dffef 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItem.md
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItem.md
@@ -5,13 +5,13 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Title** | **string** |  | 
-**Type** | **string** |  | 
+**Type** | [**BaseItemType**](BaseItemType.md) |  | 
 
 ## Methods
 
 ### NewBaseItem
 
-`func NewBaseItem(title string, type_ string, ) *BaseItem`
+`func NewBaseItem(title string, type_ BaseItemType, ) *BaseItem`
 
 NewBaseItem instantiates a new BaseItem object
 This constructor will assign default values to properties that have it defined,
@@ -48,20 +48,20 @@ SetTitle sets Title field to given value.
 
 ### GetType
 
-`func (o *BaseItem) GetType() string`
+`func (o *BaseItem) GetType() BaseItemType`
 
 GetType returns the Type field if non-nil, zero value otherwise.
 
 ### GetTypeOk
 
-`func (o *BaseItem) GetTypeOk() (*string, bool)`
+`func (o *BaseItem) GetTypeOk() (*BaseItemType, bool)`
 
 GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetType
 
-`func (o *BaseItem) SetType(v string)`
+`func (o *BaseItem) SetType(v BaseItemType)`
 
 SetType sets Type field to given value.
 
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItemType.md b/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItemType.md
new file mode 100644
index 000000000000..eb8c21d82111
--- /dev/null
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/docs/BaseItemType.md
@@ -0,0 +1,11 @@
+# BaseItemType
+
+## Enum
+
+
+* `FINAL` (value: `"FINAL"`)
+
+
+[[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/others/go/allof_multiple_ref_and_discriminator/model_base_item.go b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item.go
index 96d4179808c9..0c5a877d96bf 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item.go
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &BaseItem{}
 // BaseItem struct for BaseItem
 type BaseItem struct {
 	Title string `json:"title"`
-	Type string `json:"type"`
+	Type BaseItemType `json:"type"`
 }
 
 type _BaseItem BaseItem
@@ -31,7 +31,7 @@ type _BaseItem BaseItem
 // 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 NewBaseItem(title string, type_ string) *BaseItem {
+func NewBaseItem(title string, type_ BaseItemType) *BaseItem {
 	this := BaseItem{}
 	this.Title = title
 	this.Type = type_
@@ -71,9 +71,9 @@ func (o *BaseItem) SetTitle(v string) {
 }
 
 // GetType returns the Type field value
-func (o *BaseItem) GetType() string {
+func (o *BaseItem) GetType() BaseItemType {
 	if o == nil {
-		var ret string
+		var ret BaseItemType
 		return ret
 	}
 
@@ -82,7 +82,7 @@ func (o *BaseItem) GetType() string {
 
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
-func (o *BaseItem) GetTypeOk() (*string, bool) {
+func (o *BaseItem) GetTypeOk() (*BaseItemType, bool) {
 	if o == nil {
 		return nil, false
 	}
@@ -90,7 +90,7 @@ func (o *BaseItem) GetTypeOk() (*string, bool) {
 }
 
 // SetType sets field value
-func (o *BaseItem) SetType(v string) {
+func (o *BaseItem) SetType(v BaseItemType) {
 	o.Type = v
 }
 
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item_type.go b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item_type.go
new file mode 100644
index 000000000000..49ac0765081f
--- /dev/null
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_base_item_type.go
@@ -0,0 +1,109 @@
+/*
+Test
+
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package openapi
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// BaseItemType the model 'BaseItemType'
+type BaseItemType string
+
+// List of base_item_type
+const (
+	FINAL BaseItemType = "FINAL"
+)
+
+// All allowed values of BaseItemType enum
+var AllowedBaseItemTypeEnumValues = []BaseItemType{
+	"FINAL",
+}
+
+func (v *BaseItemType) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := BaseItemType(value)
+	for _, existing := range AllowedBaseItemTypeEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid BaseItemType", value)
+}
+
+// NewBaseItemTypeFromValue returns a pointer to a valid BaseItemType
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewBaseItemTypeFromValue(v string) (*BaseItemType, error) {
+	ev := BaseItemType(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for BaseItemType: valid values are %v", v, AllowedBaseItemTypeEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v BaseItemType) IsValid() bool {
+	for _, existing := range AllowedBaseItemTypeEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to base_item_type value
+func (v BaseItemType) Ptr() *BaseItemType {
+	return &v
+}
+
+type NullableBaseItemType struct {
+	value *BaseItemType
+	isSet bool
+}
+
+func (v NullableBaseItemType) Get() *BaseItemType {
+	return v.value
+}
+
+func (v *NullableBaseItemType) Set(val *BaseItemType) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableBaseItemType) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableBaseItemType) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableBaseItemType(val *BaseItemType) *NullableBaseItemType {
+	return &NullableBaseItemType{value: val, isSet: true}
+}
+
+func (v NullableBaseItemType) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableBaseItemType) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/others/go/allof_multiple_ref_and_discriminator/model_final_item.go b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_final_item.go
index d3845f84998f..cadc0b59d409 100644
--- a/samples/client/others/go/allof_multiple_ref_and_discriminator/model_final_item.go
+++ b/samples/client/others/go/allof_multiple_ref_and_discriminator/model_final_item.go
@@ -34,7 +34,7 @@ type _FinalItem FinalItem
 // 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 NewFinalItem(prop1 string, quantity int32, unitPrice float64, totalPrice float64, title string, type_ string) *FinalItem {
+func NewFinalItem(prop1 string, quantity int32, unitPrice float64, totalPrice float64, title string, type_ BaseItemType) *FinalItem {
 	this := FinalItem{}
 	this.Title = title
 	this.Type = type_
diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/FILES b/samples/client/petstore/go/go-petstore/.openapi-generator/FILES
index 9df35e611151..81c9a19de719 100644
--- a/samples/client/petstore/go/go-petstore/.openapi-generator/FILES
+++ b/samples/client/petstore/go/go-petstore/.openapi-generator/FILES
@@ -25,6 +25,7 @@ docs/ArrayOfArrayOfNumberOnly.md
 docs/ArrayOfNumberOnly.md
 docs/ArrayTest.md
 docs/BigCat.md
+docs/BigCatAllOfKind.md
 docs/Capitalization.md
 docs/Cat.md
 docs/Category.md
@@ -32,30 +33,43 @@ docs/ClassModel.md
 docs/Client.md
 docs/Dog.md
 docs/EnumArrays.md
+docs/EnumArraysArrayEnumInner.md
+docs/EnumArraysJustSymbol.md
 docs/EnumClass.md
 docs/EnumTest.md
+docs/EnumTestEnumInteger.md
+docs/EnumTestEnumString.md
 docs/FakeAPI.md
 docs/FakeClassnameTags123API.md
 docs/File.md
 docs/FileSchemaTestClass.md
+docs/FindPetsByStatusStatusParameterInner.md
 docs/FormatTest.md
 docs/HasOnlyReadOnly.md
 docs/List.md
 docs/MapTest.md
+docs/MapTestMapOfEnumStringValue.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
 docs/Name.md
 docs/NumberOnly.md
 docs/Order.md
+docs/OrderStatus.md
 docs/OuterComposite.md
 docs/OuterEnum.md
 docs/Pet.md
 docs/PetAPI.md
+docs/PetStatus.md
 docs/ReadOnlyFirst.md
 docs/Return.md
 docs/SpecialModelName.md
 docs/StoreAPI.md
 docs/Tag.md
+docs/TestEnumParametersEnumHeaderStringParameter.md
+docs/TestEnumParametersEnumQueryDoubleParameter.md
+docs/TestEnumParametersEnumQueryIntegerParameter.md
+docs/TestEnumParametersRequestEnumFormString.md
+docs/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/TypeHolderDefault.md
 docs/TypeHolderExample.md
 docs/User.md
@@ -79,6 +93,7 @@ model_array_of_array_of_number_only.go
 model_array_of_number_only.go
 model_array_test_.go
 model_big_cat.go
+model_big_cat_all_of_kind.go
 model_capitalization.go
 model_cat.go
 model_category.go
@@ -86,25 +101,38 @@ model_class_model.go
 model_client.go
 model_dog.go
 model_enum_arrays.go
+model_enum_arrays_array_enum_inner.go
+model_enum_arrays_just_symbol.go
 model_enum_class.go
 model_enum_test_.go
+model_enum_test_enum_integer.go
+model_enum_test_enum_string.go
 model_file.go
 model_file_schema_test_class.go
+model_find_pets_by_status_status_parameter_inner.go
 model_format_test_.go
 model_has_only_read_only.go
 model_list.go
 model_map_test_.go
+model_map_test_map_of_enum_string_value.go
 model_mixed_properties_and_additional_properties_class.go
 model_name.go
 model_number_only.go
 model_order.go
+model_order_status.go
 model_outer_composite.go
 model_outer_enum.go
 model_pet.go
+model_pet_status.go
 model_read_only_first.go
 model_return.go
 model_special_model_name.go
 model_tag.go
+model_test_enum_parameters_enum_header_string_parameter.go
+model_test_enum_parameters_enum_query_double_parameter.go
+model_test_enum_parameters_enum_query_integer_parameter.go
+model_test_enum_parameters_request_enum_form_string.go
+model_test_enum_parameters_request_enum_form_string_array_inner.go
 model_type_holder_default.go
 model_type_holder_example.go
 model_user.go
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index 4f8f4b1d75fa..eb1291e4ed5b 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -134,6 +134,7 @@ Class | Method | HTTP request | Description
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
  - [BigCat](docs/BigCat.md)
+ - [BigCatAllOfKind](docs/BigCatAllOfKind.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
@@ -141,26 +142,39 @@ Class | Method | HTTP request | Description
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
  - [EnumArrays](docs/EnumArrays.md)
+ - [EnumArraysArrayEnumInner](docs/EnumArraysArrayEnumInner.md)
+ - [EnumArraysJustSymbol](docs/EnumArraysJustSymbol.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [EnumTestEnumInteger](docs/EnumTestEnumInteger.md)
+ - [EnumTestEnumString](docs/EnumTestEnumString.md)
  - [File](docs/File.md)
  - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [FindPetsByStatusStatusParameterInner](docs/FindPetsByStatusStatusParameterInner.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [List](docs/List.md)
  - [MapTest](docs/MapTest.md)
+ - [MapTestMapOfEnumStringValue](docs/MapTestMapOfEnumStringValue.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [Name](docs/Name.md)
  - [NumberOnly](docs/NumberOnly.md)
  - [Order](docs/Order.md)
+ - [OrderStatus](docs/OrderStatus.md)
  - [OuterComposite](docs/OuterComposite.md)
  - [OuterEnum](docs/OuterEnum.md)
  - [Pet](docs/Pet.md)
+ - [PetStatus](docs/PetStatus.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Return](docs/Return.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
+ - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
+ - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
+ - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
+ - [TestEnumParametersRequestEnumFormStringArrayInner](docs/TestEnumParametersRequestEnumFormStringArrayInner.md)
  - [TypeHolderDefault](docs/TypeHolderDefault.md)
  - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml
index 55bdb39966d3..4ddc08d5f845 100644
--- a/samples/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml
@@ -91,12 +91,7 @@ paths:
         required: true
         schema:
           items:
-            default: available
-            enum:
-            - available
-            - pending
-            - sold
-            type: string
+            $ref: "#/components/schemas/findPetsByStatus_status_parameter_inner"
           type: array
         style: form
       responses:
@@ -656,64 +651,38 @@ paths:
         name: enum_header_string_array
         schema:
           items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
         in: header
         name: enum_header_string
         schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: 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:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
         in: query
         name: enum_query_string
         schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_integer
         schema:
-          enum:
-          - 1
-          - -2
-          format: int32
-          type: integer
+          $ref: "#/components/schemas/testEnumParameters_enum_query_integer_parameter"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_double
         schema:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
+          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
       requestBody:
         content:
           application/x-www-form-urlencoded:
@@ -1111,12 +1080,7 @@ components:
           format: date-time
           type: string
         status:
-          description: Order Status
-          enum:
-          - placed
-          - approved
-          - delivered
-          type: string
+          $ref: "#/components/schemas/Order_status"
         complete:
           default: false
           type: boolean
@@ -1228,12 +1192,7 @@ components:
             name: tag
             wrapped: true
         status:
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
+          $ref: "#/components/schemas/Pet_status"
       required:
       - name
       - photoUrls
@@ -1327,12 +1286,7 @@ components:
       - $ref: "#/components/schemas/Cat"
       - properties:
           kind:
-            enum:
-            - lions
-            - tigers
-            - leopards
-            - jaguars
-            type: string
+            $ref: "#/components/schemas/BigCat_allOf_kind"
         type: object
     Animal:
       discriminator:
@@ -1422,29 +1376,13 @@ components:
     Enum_Test:
       properties:
         enum_string:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
+          $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
+          $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_integer:
-          enum:
-          - 1
-          - -1
-          format: int32
-          type: integer
+          $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_number:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
+          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
       required:
@@ -1628,10 +1566,7 @@ components:
           type: object
         map_of_enum_string:
           additionalProperties:
-            enum:
-            - UPPER
-            - lower
-            type: string
+            $ref: "#/components/schemas/MapTest_map_of_enum_string_value"
           type: object
         direct_map:
           additionalProperties:
@@ -1686,16 +1621,10 @@ components:
     EnumArrays:
       properties:
         just_symbol:
-          enum:
-          - '>='
-          - $
-          type: string
+          $ref: "#/components/schemas/EnumArrays_just_symbol"
         array_enum:
           items:
-            enum:
-            - fish
-            - crab
-            type: string
+            $ref: "#/components/schemas/EnumArrays_array_enum_inner"
           type: array
       type: object
     OuterEnum:
@@ -1990,6 +1919,13 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    findPetsByStatus_status_parameter_inner:
+      default: available
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
     updatePetWithForm_request:
       properties:
         name:
@@ -2009,26 +1945,49 @@ components:
           format: binary
           type: string
       type: object
+    testEnumParameters_request_enum_form_string_array_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_request_enum_form_string:
+      default: -efg
+      description: Form parameter enum test (string)
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
           items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         enum_form_string:
-          default: -efg
-          description: Form parameter enum test (string)
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_integer_parameter:
+      enum:
+      - 1
+      - -2
+      format: int32
+      type: integer
+    testEnumParameters_enum_query_double_parameter:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     testEndpointParameters_request:
       properties:
         integer:
@@ -2126,6 +2085,54 @@ components:
       required:
       - requiredFile
       type: object
+    Order_status:
+      description: Order Status
+      enum:
+      - placed
+      - approved
+      - delivered
+      type: string
+    Pet_status:
+      description: pet status in the store
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
+    BigCat_allOf_kind:
+      enum:
+      - lions
+      - tigers
+      - leopards
+      - jaguars
+      type: string
+    Enum_Test_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      type: string
+    Enum_Test_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      type: integer
+    MapTest_map_of_enum_string_value:
+      enum:
+      - UPPER
+      - lower
+      type: string
+    EnumArrays_just_symbol:
+      enum:
+      - '>='
+      - $
+      type: string
+    EnumArrays_array_enum_inner:
+      enum:
+      - fish
+      - crab
+      type: string
   securitySchemes:
     petstore_auth:
       flows:
diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go
index d37cf69d4192..2a33f4b62bc7 100644
--- a/samples/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_fake.go
@@ -1323,60 +1323,59 @@ func (a *FakeAPIService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 type ApiTestEnumParametersRequest struct {
 	ctx context.Context
 	ApiService FakeAPI
-	enumHeaderStringArray *[]string
-	enumHeaderString *string
-	enumQueryStringArray *[]string
-	enumQueryString *string
-	enumQueryInteger *int32
-	enumQueryDouble *float64
-	enumFormStringArray *[]string
-	enumFormString *string
+	enumHeaderStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumHeaderString *TestEnumParametersEnumHeaderStringParameter
+	enumQueryStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumQueryString *TestEnumParametersEnumHeaderStringParameter
+	enumQueryInteger *TestEnumParametersEnumQueryIntegerParameter
+	enumQueryDouble *TestEnumParametersEnumQueryDoubleParameter
+	enumFormStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumFormString *TestEnumParametersRequestEnumFormString
 }
 
 // Header parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumHeaderStringArray = &enumHeaderStringArray
 	return r
 }
 
 // Header parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString TestEnumParametersEnumHeaderStringParameter) ApiTestEnumParametersRequest {
 	r.enumHeaderString = &enumHeaderString
 	return r
 }
 
 // Query parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumQueryStringArray = &enumQueryStringArray
 	return r
 }
 
 // Query parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString TestEnumParametersEnumHeaderStringParameter) ApiTestEnumParametersRequest {
 	r.enumQueryString = &enumQueryString
 	return r
 }
 
 // Query parameter enum test (double)
-func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger int32) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger TestEnumParametersEnumQueryIntegerParameter) ApiTestEnumParametersRequest {
 	r.enumQueryInteger = &enumQueryInteger
 	return r
 }
 
 // Query parameter enum test (double)
-func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble float64) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble TestEnumParametersEnumQueryDoubleParameter) ApiTestEnumParametersRequest {
 	r.enumQueryDouble = &enumQueryDouble
 	return r
 }
 
 // Form parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumFormStringArray = &enumFormStringArray
 	return r
 }
 
-// Form parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString TestEnumParametersRequestEnumFormString) ApiTestEnumParametersRequest {
 	r.enumFormString = &enumFormString
 	return r
 }
@@ -1425,7 +1424,7 @@ func (a *FakeAPIService) TestEnumParametersExecute(r ApiTestEnumParametersReques
 	if r.enumQueryString != nil {
 		parameterAddToHeaderOrQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "", "")
 	} else {
-		var defaultValue string = "-efg"
+		var defaultValue TestEnumParametersEnumHeaderStringParameter = "-efg"
 		r.enumQueryString = &defaultValue
 	}
 	if r.enumQueryInteger != nil {
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index 96bf26a5ac6d..900ede76467c 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -345,11 +345,11 @@ func (a *PetAPIService) DeletePetExecute(r ApiDeletePetRequest) (*http.Response,
 type ApiFindPetsByStatusRequest struct {
 	ctx context.Context
 	ApiService PetAPI
-	status *[]string
+	status *[]FindPetsByStatusStatusParameterInner
 }
 
 // Status values that need to be considered for filter
-func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusRequest {
+func (r ApiFindPetsByStatusRequest) Status(status []FindPetsByStatusStatusParameterInner) ApiFindPetsByStatusRequest {
 	r.status = &status
 	return r
 }
diff --git a/samples/client/petstore/go/go-petstore/docs/BigCat.md b/samples/client/petstore/go/go-petstore/docs/BigCat.md
index fb9db9299397..88e9627a862e 100644
--- a/samples/client/petstore/go/go-petstore/docs/BigCat.md
+++ b/samples/client/petstore/go/go-petstore/docs/BigCat.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Kind** | Pointer to **string** |  | [optional] 
+**Kind** | Pointer to [**BigCatAllOfKind**](BigCatAllOfKind.md) |  | [optional] 
 
 ## Methods
 
@@ -27,20 +27,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetKind
 
-`func (o *BigCat) GetKind() string`
+`func (o *BigCat) GetKind() BigCatAllOfKind`
 
 GetKind returns the Kind field if non-nil, zero value otherwise.
 
 ### GetKindOk
 
-`func (o *BigCat) GetKindOk() (*string, bool)`
+`func (o *BigCat) GetKindOk() (*BigCatAllOfKind, bool)`
 
 GetKindOk returns a tuple with the Kind field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetKind
 
-`func (o *BigCat) SetKind(v string)`
+`func (o *BigCat) SetKind(v BigCatAllOfKind)`
 
 SetKind sets Kind field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/BigCatAllOfKind.md b/samples/client/petstore/go/go-petstore/docs/BigCatAllOfKind.md
new file mode 100644
index 000000000000..b19b98f0aae0
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/BigCatAllOfKind.md
@@ -0,0 +1,17 @@
+# BigCatAllOfKind
+
+## Enum
+
+
+* `LIONS` (value: `"lions"`)
+
+* `TIGERS` (value: `"tigers"`)
+
+* `LEOPARDS` (value: `"leopards"`)
+
+* `JAGUARS` (value: `"jaguars"`)
+
+
+[[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/go/go-petstore/docs/EnumArrays.md b/samples/client/petstore/go/go-petstore/docs/EnumArrays.md
index 28011e23f568..c7281fa41ac1 100644
--- a/samples/client/petstore/go/go-petstore/docs/EnumArrays.md
+++ b/samples/client/petstore/go/go-petstore/docs/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | Pointer to **string** |  | [optional] 
-**ArrayEnum** | Pointer to **[]string** |  | [optional] 
+**JustSymbol** | Pointer to [**EnumArraysJustSymbol**](EnumArraysJustSymbol.md) |  | [optional] 
+**ArrayEnum** | Pointer to [**[]EnumArraysArrayEnumInner**](EnumArraysArrayEnumInner.md) |  | [optional] 
 
 ## Methods
 
@@ -28,20 +28,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetJustSymbol
 
-`func (o *EnumArrays) GetJustSymbol() string`
+`func (o *EnumArrays) GetJustSymbol() EnumArraysJustSymbol`
 
 GetJustSymbol returns the JustSymbol field if non-nil, zero value otherwise.
 
 ### GetJustSymbolOk
 
-`func (o *EnumArrays) GetJustSymbolOk() (*string, bool)`
+`func (o *EnumArrays) GetJustSymbolOk() (*EnumArraysJustSymbol, bool)`
 
 GetJustSymbolOk returns a tuple with the JustSymbol field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetJustSymbol
 
-`func (o *EnumArrays) SetJustSymbol(v string)`
+`func (o *EnumArrays) SetJustSymbol(v EnumArraysJustSymbol)`
 
 SetJustSymbol sets JustSymbol field to given value.
 
@@ -53,20 +53,20 @@ HasJustSymbol returns a boolean if a field has been set.
 
 ### GetArrayEnum
 
-`func (o *EnumArrays) GetArrayEnum() []string`
+`func (o *EnumArrays) GetArrayEnum() []EnumArraysArrayEnumInner`
 
 GetArrayEnum returns the ArrayEnum field if non-nil, zero value otherwise.
 
 ### GetArrayEnumOk
 
-`func (o *EnumArrays) GetArrayEnumOk() (*[]string, bool)`
+`func (o *EnumArrays) GetArrayEnumOk() (*[]EnumArraysArrayEnumInner, bool)`
 
 GetArrayEnumOk returns a tuple with the ArrayEnum field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetArrayEnum
 
-`func (o *EnumArrays) SetArrayEnum(v []string)`
+`func (o *EnumArrays) SetArrayEnum(v []EnumArraysArrayEnumInner)`
 
 SetArrayEnum sets ArrayEnum field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md b/samples/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md
new file mode 100644
index 000000000000..208b35975273
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md
@@ -0,0 +1,13 @@
+# EnumArraysArrayEnumInner
+
+## Enum
+
+
+* `FISH` (value: `"fish"`)
+
+* `CRAB` (value: `"crab"`)
+
+
+[[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/go/go-petstore/docs/EnumArraysJustSymbol.md b/samples/client/petstore/go/go-petstore/docs/EnumArraysJustSymbol.md
new file mode 100644
index 000000000000..18b0d62096a1
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/EnumArraysJustSymbol.md
@@ -0,0 +1,13 @@
+# EnumArraysJustSymbol
+
+## Enum
+
+
+* `GREATER_THAN_OR_EQUAL_TO` (value: `">="`)
+
+* `DOLLAR` (value: `"$"`)
+
+
+[[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/go/go-petstore/docs/EnumTest.md b/samples/client/petstore/go/go-petstore/docs/EnumTest.md
index 131b8e110a04..a33c78562502 100644
--- a/samples/client/petstore/go/go-petstore/docs/EnumTest.md
+++ b/samples/client/petstore/go/go-petstore/docs/EnumTest.md
@@ -4,17 +4,17 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**EnumInteger** | Pointer to **int32** |  | [optional] 
-**EnumNumber** | Pointer to **float64** |  | [optional] 
+**EnumString** | Pointer to [**EnumTestEnumString**](EnumTestEnumString.md) |  | [optional] 
+**EnumStringRequired** | [**EnumTestEnumString**](EnumTestEnumString.md) |  | 
+**EnumInteger** | Pointer to [**EnumTestEnumInteger**](EnumTestEnumInteger.md) |  | [optional] 
+**EnumNumber** | Pointer to [**TestEnumParametersEnumQueryDoubleParameter**](TestEnumParametersEnumQueryDoubleParameter.md) |  | [optional] 
 **OuterEnum** | Pointer to [**OuterEnum**](OuterEnum.md) |  | [optional] 
 
 ## Methods
 
 ### NewEnumTest
 
-`func NewEnumTest(enumStringRequired string, ) *EnumTest`
+`func NewEnumTest(enumStringRequired EnumTestEnumString, ) *EnumTest`
 
 NewEnumTest instantiates a new EnumTest object
 This constructor will assign default values to properties that have it defined,
@@ -31,20 +31,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetEnumString
 
-`func (o *EnumTest) GetEnumString() string`
+`func (o *EnumTest) GetEnumString() EnumTestEnumString`
 
 GetEnumString returns the EnumString field if non-nil, zero value otherwise.
 
 ### GetEnumStringOk
 
-`func (o *EnumTest) GetEnumStringOk() (*string, bool)`
+`func (o *EnumTest) GetEnumStringOk() (*EnumTestEnumString, bool)`
 
 GetEnumStringOk returns a tuple with the EnumString field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumString
 
-`func (o *EnumTest) SetEnumString(v string)`
+`func (o *EnumTest) SetEnumString(v EnumTestEnumString)`
 
 SetEnumString sets EnumString field to given value.
 
@@ -56,40 +56,40 @@ HasEnumString returns a boolean if a field has been set.
 
 ### GetEnumStringRequired
 
-`func (o *EnumTest) GetEnumStringRequired() string`
+`func (o *EnumTest) GetEnumStringRequired() EnumTestEnumString`
 
 GetEnumStringRequired returns the EnumStringRequired field if non-nil, zero value otherwise.
 
 ### GetEnumStringRequiredOk
 
-`func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool)`
+`func (o *EnumTest) GetEnumStringRequiredOk() (*EnumTestEnumString, bool)`
 
 GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumStringRequired
 
-`func (o *EnumTest) SetEnumStringRequired(v string)`
+`func (o *EnumTest) SetEnumStringRequired(v EnumTestEnumString)`
 
 SetEnumStringRequired sets EnumStringRequired field to given value.
 
 
 ### GetEnumInteger
 
-`func (o *EnumTest) GetEnumInteger() int32`
+`func (o *EnumTest) GetEnumInteger() EnumTestEnumInteger`
 
 GetEnumInteger returns the EnumInteger field if non-nil, zero value otherwise.
 
 ### GetEnumIntegerOk
 
-`func (o *EnumTest) GetEnumIntegerOk() (*int32, bool)`
+`func (o *EnumTest) GetEnumIntegerOk() (*EnumTestEnumInteger, bool)`
 
 GetEnumIntegerOk returns a tuple with the EnumInteger field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumInteger
 
-`func (o *EnumTest) SetEnumInteger(v int32)`
+`func (o *EnumTest) SetEnumInteger(v EnumTestEnumInteger)`
 
 SetEnumInteger sets EnumInteger field to given value.
 
@@ -101,20 +101,20 @@ HasEnumInteger returns a boolean if a field has been set.
 
 ### GetEnumNumber
 
-`func (o *EnumTest) GetEnumNumber() float64`
+`func (o *EnumTest) GetEnumNumber() TestEnumParametersEnumQueryDoubleParameter`
 
 GetEnumNumber returns the EnumNumber field if non-nil, zero value otherwise.
 
 ### GetEnumNumberOk
 
-`func (o *EnumTest) GetEnumNumberOk() (*float64, bool)`
+`func (o *EnumTest) GetEnumNumberOk() (*TestEnumParametersEnumQueryDoubleParameter, bool)`
 
 GetEnumNumberOk returns a tuple with the EnumNumber field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumNumber
 
-`func (o *EnumTest) SetEnumNumber(v float64)`
+`func (o *EnumTest) SetEnumNumber(v TestEnumParametersEnumQueryDoubleParameter)`
 
 SetEnumNumber sets EnumNumber field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md b/samples/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md
new file mode 100644
index 000000000000..a72b185f50a8
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md
@@ -0,0 +1,13 @@
+# EnumTestEnumInteger
+
+## Enum
+
+
+* `_1` (value: `1`)
+
+* `_MINUS_1` (value: `-1`)
+
+
+[[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/go/go-petstore/docs/EnumTestEnumString.md b/samples/client/petstore/go/go-petstore/docs/EnumTestEnumString.md
new file mode 100644
index 000000000000..6f43802c998d
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/EnumTestEnumString.md
@@ -0,0 +1,15 @@
+# EnumTestEnumString
+
+## Enum
+
+
+* `UPPER` (value: `"UPPER"`)
+
+* `LOWER` (value: `"lower"`)
+
+* `EMPTY` (value: `""`)
+
+
+[[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/go/go-petstore/docs/FakeAPI.md b/samples/client/petstore/go/go-petstore/docs/FakeAPI.md
index 34a895493c67..bb28478808cb 100644
--- a/samples/client/petstore/go/go-petstore/docs/FakeAPI.md
+++ b/samples/client/petstore/go/go-petstore/docs/FakeAPI.md
@@ -655,14 +655,14 @@ import (
 )
 
 func main() {
-	enumHeaderStringArray := []string{"EnumHeaderStringArray_example"} // []string | Header parameter enum test (string array) (optional)
-	enumHeaderString := "enumHeaderString_example" // string | Header parameter enum test (string) (optional) (default to "-efg")
-	enumQueryStringArray := []string{"EnumQueryStringArray_example"} // []string | Query parameter enum test (string array) (optional)
-	enumQueryString := "enumQueryString_example" // string | Query parameter enum test (string) (optional) (default to "-efg")
-	enumQueryInteger := int32(56) // int32 | Query parameter enum test (double) (optional)
-	enumQueryDouble := float64(1.2) // float64 | Query parameter enum test (double) (optional)
-	enumFormStringArray := []string{"Inner_example"} // []string | Form parameter enum test (string array) (optional) (default to "$")
-	enumFormString := "enumFormString_example" // string | Form parameter enum test (string) (optional) (default to "-efg")
+	enumHeaderStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Header parameter enum test (string array) (optional)
+	enumHeaderString := openapiclient.testEnumParameters_enum_header_string_parameter("_abc") // TestEnumParametersEnumHeaderStringParameter | Header parameter enum test (string) (optional) (default to "-efg")
+	enumQueryStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Query parameter enum test (string array) (optional)
+	enumQueryString := openapiclient.testEnumParameters_enum_header_string_parameter("_abc") // TestEnumParametersEnumHeaderStringParameter | Query parameter enum test (string) (optional) (default to "-efg")
+	enumQueryInteger := openapiclient.testEnumParameters_enum_query_integer_parameter(1) // TestEnumParametersEnumQueryIntegerParameter | Query parameter enum test (double) (optional)
+	enumQueryDouble := openapiclient.testEnumParameters_enum_query_double_parameter(1.1) // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional)
+	enumFormStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Form parameter enum test (string array) (optional) (default to "$")
+	enumFormString := openapiclient.testEnumParameters_request_enum_form_string("_abc") // TestEnumParametersRequestEnumFormString |  (optional) (default to "-efg")
 
 	configuration := openapiclient.NewConfiguration()
 	apiClient := openapiclient.NewAPIClient(configuration)
@@ -685,14 +685,14 @@ Other parameters are passed through a pointer to a apiTestEnumParametersRequest
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | **[]string** | Header parameter enum test (string array) | 
- **enumHeaderString** | **string** | Header parameter enum test (string) | [default to &quot;-efg&quot;]
- **enumQueryStringArray** | **[]string** | Query parameter enum test (string array) | 
- **enumQueryString** | **string** | Query parameter enum test (string) | [default to &quot;-efg&quot;]
- **enumQueryInteger** | **int32** | Query parameter enum test (double) | 
- **enumQueryDouble** | **float64** | Query parameter enum test (double) | 
- **enumFormStringArray** | **[]string** | Form parameter enum test (string array) | [default to &quot;$&quot;]
- **enumFormString** | **string** | Form parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumHeaderStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | 
+ **enumHeaderString** | [**TestEnumParametersEnumHeaderStringParameter**](TestEnumParametersEnumHeaderStringParameter.md) | Header parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumQueryStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | 
+ **enumQueryString** | [**TestEnumParametersEnumHeaderStringParameter**](TestEnumParametersEnumHeaderStringParameter.md) | Query parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumQueryInteger** | [**TestEnumParametersEnumQueryIntegerParameter**](TestEnumParametersEnumQueryIntegerParameter.md) | Query parameter enum test (double) | 
+ **enumQueryDouble** | [**TestEnumParametersEnumQueryDoubleParameter**](TestEnumParametersEnumQueryDoubleParameter.md) | Query parameter enum test (double) | 
+ **enumFormStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [default to &quot;$&quot;]
+ **enumFormString** | [**TestEnumParametersRequestEnumFormString**](TestEnumParametersRequestEnumFormString.md) |  | [default to &quot;-efg&quot;]
 
 ### Return type
 
diff --git a/samples/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md b/samples/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md
new file mode 100644
index 000000000000..0efe505de3f9
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md
@@ -0,0 +1,15 @@
+# FindPetsByStatusStatusParameterInner
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/go/go-petstore/docs/MapTest.md b/samples/client/petstore/go/go-petstore/docs/MapTest.md
index d394cb5a9c18..00802d54069f 100644
--- a/samples/client/petstore/go/go-petstore/docs/MapTest.md
+++ b/samples/client/petstore/go/go-petstore/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | Pointer to **map[string]map[string]string** |  | [optional] 
-**MapOfEnumString** | Pointer to **map[string]string** |  | [optional] 
+**MapOfEnumString** | Pointer to [**map[string]MapTestMapOfEnumStringValue**](MapTestMapOfEnumStringValue.md) |  | [optional] 
 **DirectMap** | Pointer to **map[string]bool** |  | [optional] 
 **IndirectMap** | Pointer to **map[string]bool** |  | [optional] 
 
@@ -55,20 +55,20 @@ HasMapMapOfString returns a boolean if a field has been set.
 
 ### GetMapOfEnumString
 
-`func (o *MapTest) GetMapOfEnumString() map[string]string`
+`func (o *MapTest) GetMapOfEnumString() map[string]MapTestMapOfEnumStringValue`
 
 GetMapOfEnumString returns the MapOfEnumString field if non-nil, zero value otherwise.
 
 ### GetMapOfEnumStringOk
 
-`func (o *MapTest) GetMapOfEnumStringOk() (*map[string]string, bool)`
+`func (o *MapTest) GetMapOfEnumStringOk() (*map[string]MapTestMapOfEnumStringValue, bool)`
 
 GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetMapOfEnumString
 
-`func (o *MapTest) SetMapOfEnumString(v map[string]string)`
+`func (o *MapTest) SetMapOfEnumString(v map[string]MapTestMapOfEnumStringValue)`
 
 SetMapOfEnumString sets MapOfEnumString field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md b/samples/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md
new file mode 100644
index 000000000000..67b6c07c23ad
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md
@@ -0,0 +1,13 @@
+# MapTestMapOfEnumStringValue
+
+## Enum
+
+
+* `UPPER` (value: `"UPPER"`)
+
+* `LOWER` (value: `"lower"`)
+
+
+[[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/go/go-petstore/docs/Order.md b/samples/client/petstore/go/go-petstore/docs/Order.md
index 36aa2ef3ff15..cc343dddef32 100644
--- a/samples/client/petstore/go/go-petstore/docs/Order.md
+++ b/samples/client/petstore/go/go-petstore/docs/Order.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **PetId** | Pointer to **int64** |  | [optional] 
 **Quantity** | Pointer to **int32** |  | [optional] 
 **ShipDate** | Pointer to **time.Time** |  | [optional] 
-**Status** | Pointer to **string** | Order Status | [optional] 
+**Status** | Pointer to [**OrderStatus**](OrderStatus.md) |  | [optional] 
 **Complete** | Pointer to **bool** |  | [optional] [default to false]
 
 ## Methods
@@ -132,20 +132,20 @@ HasShipDate returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Order) GetStatus() string`
+`func (o *Order) GetStatus() OrderStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Order) GetStatusOk() (*string, bool)`
+`func (o *Order) GetStatusOk() (*OrderStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Order) SetStatus(v string)`
+`func (o *Order) SetStatus(v OrderStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/OrderStatus.md b/samples/client/petstore/go/go-petstore/docs/OrderStatus.md
new file mode 100644
index 000000000000..22e6010b297d
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/OrderStatus.md
@@ -0,0 +1,15 @@
+# OrderStatus
+
+## Enum
+
+
+* `PLACED` (value: `"placed"`)
+
+* `APPROVED` (value: `"approved"`)
+
+* `DELIVERED` (value: `"delivered"`)
+
+
+[[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/go/go-petstore/docs/Pet.md b/samples/client/petstore/go/go-petstore/docs/Pet.md
index a6eae34657d3..9c5ceb9f2e34 100644
--- a/samples/client/petstore/go/go-petstore/docs/Pet.md
+++ b/samples/client/petstore/go/go-petstore/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **Name** | **string** |  | 
 **PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | Pointer to **string** | pet status in the store | [optional] 
+**Status** | Pointer to [**PetStatus**](PetStatus.md) |  | [optional] 
 
 ## Methods
 
@@ -147,20 +147,20 @@ HasTags returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Pet) GetStatus() string`
+`func (o *Pet) GetStatus() PetStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Pet) GetStatusOk() (*string, bool)`
+`func (o *Pet) GetStatusOk() (*PetStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Pet) SetStatus(v string)`
+`func (o *Pet) SetStatus(v PetStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/client/petstore/go/go-petstore/docs/PetAPI.md b/samples/client/petstore/go/go-petstore/docs/PetAPI.md
index adaec60d0556..c84895083aa4 100644
--- a/samples/client/petstore/go/go-petstore/docs/PetAPI.md
+++ b/samples/client/petstore/go/go-petstore/docs/PetAPI.md
@@ -167,7 +167,7 @@ import (
 )
 
 func main() {
-	status := []string{"Status_example"} // []string | Status values that need to be considered for filter
+	status := []openapiclient.FindPetsByStatusStatusParameterInner{openapiclient.findPetsByStatus_status_parameter_inner("available")} // []FindPetsByStatusStatusParameterInner | Status values that need to be considered for filter
 
 	configuration := openapiclient.NewConfiguration()
 	apiClient := openapiclient.NewAPIClient(configuration)
@@ -192,7 +192,7 @@ Other parameters are passed through a pointer to a apiFindPetsByStatusRequest st
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | **[]string** | Status values that need to be considered for filter | 
+ **status** | [**[]FindPetsByStatusStatusParameterInner**](FindPetsByStatusStatusParameterInner.md) | Status values that need to be considered for filter | 
 
 ### Return type
 
diff --git a/samples/client/petstore/go/go-petstore/docs/PetStatus.md b/samples/client/petstore/go/go-petstore/docs/PetStatus.md
new file mode 100644
index 000000000000..9b41cdb3b685
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/PetStatus.md
@@ -0,0 +1,15 @@
+# PetStatus
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/go/go-petstore/docs/TestEnumParametersEnumHeaderStringParameter.md b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..71416abd15a0
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,15 @@
+# TestEnumParametersEnumHeaderStringParameter
+
+## Enum
+
+
+* `ABC` (value: `"_abc"`)
+
+* `EFG` (value: `"-efg"`)
+
+* `XYZ` (value: `"(xyz)"`)
+
+
+[[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/go/go-petstore/docs/TestEnumParametersEnumQueryDoubleParameter.md b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryDoubleParameter.md
new file mode 100644
index 000000000000..fc31acb41971
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryDoubleParameter.md
@@ -0,0 +1,13 @@
+# TestEnumParametersEnumQueryDoubleParameter
+
+## Enum
+
+
+* `_1_DOT_1` (value: `1.1`)
+
+* `_MINUS_1_DOT_2` (value: `-1.2`)
+
+
+[[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/go/go-petstore/docs/TestEnumParametersEnumQueryIntegerParameter.md b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryIntegerParameter.md
new file mode 100644
index 000000000000..524ba4325596
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryIntegerParameter.md
@@ -0,0 +1,13 @@
+# TestEnumParametersEnumQueryIntegerParameter
+
+## Enum
+
+
+* `_1` (value: `1`)
+
+* `_MINUS_2` (value: `-2`)
+
+
+[[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/go/go-petstore/docs/TestEnumParametersRequestEnumFormString.md b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormString.md
new file mode 100644
index 000000000000..28709f9f40d6
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormString.md
@@ -0,0 +1,15 @@
+# TestEnumParametersRequestEnumFormString
+
+## Enum
+
+
+* `ABC` (value: `"_abc"`)
+
+* `EFG` (value: `"-efg"`)
+
+* `XYZ` (value: `"(xyz)"`)
+
+
+[[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/go/go-petstore/docs/TestEnumParametersRequestEnumFormStringArrayInner.md b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormStringArrayInner.md
new file mode 100644
index 000000000000..a418977ee5f0
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormStringArrayInner.md
@@ -0,0 +1,13 @@
+# TestEnumParametersRequestEnumFormStringArrayInner
+
+## Enum
+
+
+* `GREATER_THAN` (value: `">"`)
+
+* `DOLLAR` (value: `"$"`)
+
+
+[[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/go/go-petstore/model_big_cat.go b/samples/client/petstore/go/go-petstore/model_big_cat.go
index 4000f2096d9d..8371a05d5e61 100644
--- a/samples/client/petstore/go/go-petstore/model_big_cat.go
+++ b/samples/client/petstore/go/go-petstore/model_big_cat.go
@@ -22,7 +22,7 @@ var _ MappedNullable = &BigCat{}
 // BigCat struct for BigCat
 type BigCat struct {
 	Cat
-	Kind *string `json:"kind,omitempty"`
+	Kind *BigCatAllOfKind `json:"kind,omitempty"`
 }
 
 type _BigCat BigCat
@@ -48,9 +48,9 @@ func NewBigCatWithDefaults() *BigCat {
 }
 
 // GetKind returns the Kind field value if set, zero value otherwise.
-func (o *BigCat) GetKind() string {
+func (o *BigCat) GetKind() BigCatAllOfKind {
 	if o == nil || IsNil(o.Kind) {
-		var ret string
+		var ret BigCatAllOfKind
 		return ret
 	}
 	return *o.Kind
@@ -58,7 +58,7 @@ func (o *BigCat) GetKind() string {
 
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *BigCat) GetKindOk() (*string, bool) {
+func (o *BigCat) GetKindOk() (*BigCatAllOfKind, bool) {
 	if o == nil || IsNil(o.Kind) {
 		return nil, false
 	}
@@ -74,8 +74,8 @@ func (o *BigCat) HasKind() bool {
 	return false
 }
 
-// SetKind gets a reference to the given string and assigns it to the Kind field.
-func (o *BigCat) SetKind(v string) {
+// SetKind gets a reference to the given BigCatAllOfKind and assigns it to the Kind field.
+func (o *BigCat) SetKind(v BigCatAllOfKind) {
 	o.Kind = &v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_big_cat_all_of_kind.go b/samples/client/petstore/go/go-petstore/model_big_cat_all_of_kind.go
new file mode 100644
index 000000000000..8c8773f8e5fb
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_big_cat_all_of_kind.go
@@ -0,0 +1,115 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// BigCatAllOfKind the model 'BigCatAllOfKind'
+type BigCatAllOfKind string
+
+// List of BigCat_allOf_kind
+const (
+	LIONS BigCatAllOfKind = "lions"
+	TIGERS BigCatAllOfKind = "tigers"
+	LEOPARDS BigCatAllOfKind = "leopards"
+	JAGUARS BigCatAllOfKind = "jaguars"
+)
+
+// All allowed values of BigCatAllOfKind enum
+var AllowedBigCatAllOfKindEnumValues = []BigCatAllOfKind{
+	"lions",
+	"tigers",
+	"leopards",
+	"jaguars",
+}
+
+func (v *BigCatAllOfKind) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := BigCatAllOfKind(value)
+	for _, existing := range AllowedBigCatAllOfKindEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid BigCatAllOfKind", value)
+}
+
+// NewBigCatAllOfKindFromValue returns a pointer to a valid BigCatAllOfKind
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewBigCatAllOfKindFromValue(v string) (*BigCatAllOfKind, error) {
+	ev := BigCatAllOfKind(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for BigCatAllOfKind: valid values are %v", v, AllowedBigCatAllOfKindEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v BigCatAllOfKind) IsValid() bool {
+	for _, existing := range AllowedBigCatAllOfKindEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to BigCat_allOf_kind value
+func (v BigCatAllOfKind) Ptr() *BigCatAllOfKind {
+	return &v
+}
+
+type NullableBigCatAllOfKind struct {
+	value *BigCatAllOfKind
+	isSet bool
+}
+
+func (v NullableBigCatAllOfKind) Get() *BigCatAllOfKind {
+	return v.value
+}
+
+func (v *NullableBigCatAllOfKind) Set(val *BigCatAllOfKind) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableBigCatAllOfKind) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableBigCatAllOfKind) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableBigCatAllOfKind(val *BigCatAllOfKind) *NullableBigCatAllOfKind {
+	return &NullableBigCatAllOfKind{value: val, isSet: true}
+}
+
+func (v NullableBigCatAllOfKind) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableBigCatAllOfKind) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_enum_arrays.go b/samples/client/petstore/go/go-petstore/model_enum_arrays.go
index 0342fe0838c9..b35c080b4544 100644
--- a/samples/client/petstore/go/go-petstore/model_enum_arrays.go
+++ b/samples/client/petstore/go/go-petstore/model_enum_arrays.go
@@ -19,8 +19,8 @@ var _ MappedNullable = &EnumArrays{}
 
 // EnumArrays struct for EnumArrays
 type EnumArrays struct {
-	JustSymbol *string `json:"just_symbol,omitempty"`
-	ArrayEnum []string `json:"array_enum,omitempty"`
+	JustSymbol *EnumArraysJustSymbol `json:"just_symbol,omitempty"`
+	ArrayEnum []EnumArraysArrayEnumInner `json:"array_enum,omitempty"`
 }
 
 // NewEnumArrays instantiates a new EnumArrays object
@@ -41,9 +41,9 @@ func NewEnumArraysWithDefaults() *EnumArrays {
 }
 
 // GetJustSymbol returns the JustSymbol field value if set, zero value otherwise.
-func (o *EnumArrays) GetJustSymbol() string {
+func (o *EnumArrays) GetJustSymbol() EnumArraysJustSymbol {
 	if o == nil || IsNil(o.JustSymbol) {
-		var ret string
+		var ret EnumArraysJustSymbol
 		return ret
 	}
 	return *o.JustSymbol
@@ -51,7 +51,7 @@ func (o *EnumArrays) GetJustSymbol() string {
 
 // GetJustSymbolOk returns a tuple with the JustSymbol field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumArrays) GetJustSymbolOk() (*string, bool) {
+func (o *EnumArrays) GetJustSymbolOk() (*EnumArraysJustSymbol, bool) {
 	if o == nil || IsNil(o.JustSymbol) {
 		return nil, false
 	}
@@ -67,15 +67,15 @@ func (o *EnumArrays) HasJustSymbol() bool {
 	return false
 }
 
-// SetJustSymbol gets a reference to the given string and assigns it to the JustSymbol field.
-func (o *EnumArrays) SetJustSymbol(v string) {
+// SetJustSymbol gets a reference to the given EnumArraysJustSymbol and assigns it to the JustSymbol field.
+func (o *EnumArrays) SetJustSymbol(v EnumArraysJustSymbol) {
 	o.JustSymbol = &v
 }
 
 // GetArrayEnum returns the ArrayEnum field value if set, zero value otherwise.
-func (o *EnumArrays) GetArrayEnum() []string {
+func (o *EnumArrays) GetArrayEnum() []EnumArraysArrayEnumInner {
 	if o == nil || IsNil(o.ArrayEnum) {
-		var ret []string
+		var ret []EnumArraysArrayEnumInner
 		return ret
 	}
 	return o.ArrayEnum
@@ -83,7 +83,7 @@ func (o *EnumArrays) GetArrayEnum() []string {
 
 // GetArrayEnumOk returns a tuple with the ArrayEnum field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumArrays) GetArrayEnumOk() ([]string, bool) {
+func (o *EnumArrays) GetArrayEnumOk() ([]EnumArraysArrayEnumInner, bool) {
 	if o == nil || IsNil(o.ArrayEnum) {
 		return nil, false
 	}
@@ -99,8 +99,8 @@ func (o *EnumArrays) HasArrayEnum() bool {
 	return false
 }
 
-// SetArrayEnum gets a reference to the given []string and assigns it to the ArrayEnum field.
-func (o *EnumArrays) SetArrayEnum(v []string) {
+// SetArrayEnum gets a reference to the given []EnumArraysArrayEnumInner and assigns it to the ArrayEnum field.
+func (o *EnumArrays) SetArrayEnum(v []EnumArraysArrayEnumInner) {
 	o.ArrayEnum = v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go b/samples/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go
new file mode 100644
index 000000000000..5b679ad162fa
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumArraysArrayEnumInner the model 'EnumArraysArrayEnumInner'
+type EnumArraysArrayEnumInner string
+
+// List of EnumArrays_array_enum_inner
+const (
+	FISH EnumArraysArrayEnumInner = "fish"
+	CRAB EnumArraysArrayEnumInner = "crab"
+)
+
+// All allowed values of EnumArraysArrayEnumInner enum
+var AllowedEnumArraysArrayEnumInnerEnumValues = []EnumArraysArrayEnumInner{
+	"fish",
+	"crab",
+}
+
+func (v *EnumArraysArrayEnumInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumArraysArrayEnumInner(value)
+	for _, existing := range AllowedEnumArraysArrayEnumInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumArraysArrayEnumInner", value)
+}
+
+// NewEnumArraysArrayEnumInnerFromValue returns a pointer to a valid EnumArraysArrayEnumInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumArraysArrayEnumInnerFromValue(v string) (*EnumArraysArrayEnumInner, error) {
+	ev := EnumArraysArrayEnumInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumArraysArrayEnumInner: valid values are %v", v, AllowedEnumArraysArrayEnumInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumArraysArrayEnumInner) IsValid() bool {
+	for _, existing := range AllowedEnumArraysArrayEnumInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to EnumArrays_array_enum_inner value
+func (v EnumArraysArrayEnumInner) Ptr() *EnumArraysArrayEnumInner {
+	return &v
+}
+
+type NullableEnumArraysArrayEnumInner struct {
+	value *EnumArraysArrayEnumInner
+	isSet bool
+}
+
+func (v NullableEnumArraysArrayEnumInner) Get() *EnumArraysArrayEnumInner {
+	return v.value
+}
+
+func (v *NullableEnumArraysArrayEnumInner) Set(val *EnumArraysArrayEnumInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumArraysArrayEnumInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumArraysArrayEnumInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumArraysArrayEnumInner(val *EnumArraysArrayEnumInner) *NullableEnumArraysArrayEnumInner {
+	return &NullableEnumArraysArrayEnumInner{value: val, isSet: true}
+}
+
+func (v NullableEnumArraysArrayEnumInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumArraysArrayEnumInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go b/samples/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go
new file mode 100644
index 000000000000..a249c1218025
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumArraysJustSymbol the model 'EnumArraysJustSymbol'
+type EnumArraysJustSymbol string
+
+// List of EnumArrays_just_symbol
+const (
+	GREATER_THAN_OR_EQUAL_TO EnumArraysJustSymbol = ">="
+	DOLLAR EnumArraysJustSymbol = "$"
+)
+
+// All allowed values of EnumArraysJustSymbol enum
+var AllowedEnumArraysJustSymbolEnumValues = []EnumArraysJustSymbol{
+	">=",
+	"$",
+}
+
+func (v *EnumArraysJustSymbol) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumArraysJustSymbol(value)
+	for _, existing := range AllowedEnumArraysJustSymbolEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumArraysJustSymbol", value)
+}
+
+// NewEnumArraysJustSymbolFromValue returns a pointer to a valid EnumArraysJustSymbol
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumArraysJustSymbolFromValue(v string) (*EnumArraysJustSymbol, error) {
+	ev := EnumArraysJustSymbol(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumArraysJustSymbol: valid values are %v", v, AllowedEnumArraysJustSymbolEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumArraysJustSymbol) IsValid() bool {
+	for _, existing := range AllowedEnumArraysJustSymbolEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to EnumArrays_just_symbol value
+func (v EnumArraysJustSymbol) Ptr() *EnumArraysJustSymbol {
+	return &v
+}
+
+type NullableEnumArraysJustSymbol struct {
+	value *EnumArraysJustSymbol
+	isSet bool
+}
+
+func (v NullableEnumArraysJustSymbol) Get() *EnumArraysJustSymbol {
+	return v.value
+}
+
+func (v *NullableEnumArraysJustSymbol) Set(val *EnumArraysJustSymbol) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumArraysJustSymbol) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumArraysJustSymbol) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumArraysJustSymbol(val *EnumArraysJustSymbol) *NullableEnumArraysJustSymbol {
+	return &NullableEnumArraysJustSymbol{value: val, isSet: true}
+}
+
+func (v NullableEnumArraysJustSymbol) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumArraysJustSymbol) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_enum_test_.go b/samples/client/petstore/go/go-petstore/model_enum_test_.go
index cf858376f48b..708955d17cb3 100644
--- a/samples/client/petstore/go/go-petstore/model_enum_test_.go
+++ b/samples/client/petstore/go/go-petstore/model_enum_test_.go
@@ -21,10 +21,10 @@ var _ MappedNullable = &EnumTest{}
 
 // EnumTest struct for EnumTest
 type EnumTest struct {
-	EnumString *string `json:"enum_string,omitempty"`
-	EnumStringRequired string `json:"enum_string_required"`
-	EnumInteger *int32 `json:"enum_integer,omitempty"`
-	EnumNumber *float64 `json:"enum_number,omitempty"`
+	EnumString *EnumTestEnumString `json:"enum_string,omitempty"`
+	EnumStringRequired EnumTestEnumString `json:"enum_string_required"`
+	EnumInteger *EnumTestEnumInteger `json:"enum_integer,omitempty"`
+	EnumNumber *TestEnumParametersEnumQueryDoubleParameter `json:"enum_number,omitempty"`
 	OuterEnum *OuterEnum `json:"outerEnum,omitempty"`
 }
 
@@ -34,7 +34,7 @@ type _EnumTest EnumTest
 // 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 NewEnumTest(enumStringRequired string) *EnumTest {
+func NewEnumTest(enumStringRequired EnumTestEnumString) *EnumTest {
 	this := EnumTest{}
 	this.EnumStringRequired = enumStringRequired
 	return &this
@@ -49,9 +49,9 @@ func NewEnumTestWithDefaults() *EnumTest {
 }
 
 // GetEnumString returns the EnumString field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumString() string {
+func (o *EnumTest) GetEnumString() EnumTestEnumString {
 	if o == nil || IsNil(o.EnumString) {
-		var ret string
+		var ret EnumTestEnumString
 		return ret
 	}
 	return *o.EnumString
@@ -59,7 +59,7 @@ func (o *EnumTest) GetEnumString() string {
 
 // GetEnumStringOk returns a tuple with the EnumString field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumStringOk() (*string, bool) {
+func (o *EnumTest) GetEnumStringOk() (*EnumTestEnumString, bool) {
 	if o == nil || IsNil(o.EnumString) {
 		return nil, false
 	}
@@ -75,15 +75,15 @@ func (o *EnumTest) HasEnumString() bool {
 	return false
 }
 
-// SetEnumString gets a reference to the given string and assigns it to the EnumString field.
-func (o *EnumTest) SetEnumString(v string) {
+// SetEnumString gets a reference to the given EnumTestEnumString and assigns it to the EnumString field.
+func (o *EnumTest) SetEnumString(v EnumTestEnumString) {
 	o.EnumString = &v
 }
 
 // GetEnumStringRequired returns the EnumStringRequired field value
-func (o *EnumTest) GetEnumStringRequired() string {
+func (o *EnumTest) GetEnumStringRequired() EnumTestEnumString {
 	if o == nil {
-		var ret string
+		var ret EnumTestEnumString
 		return ret
 	}
 
@@ -92,7 +92,7 @@ func (o *EnumTest) GetEnumStringRequired() string {
 
 // GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field value
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool) {
+func (o *EnumTest) GetEnumStringRequiredOk() (*EnumTestEnumString, bool) {
 	if o == nil {
 		return nil, false
 	}
@@ -100,14 +100,14 @@ func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool) {
 }
 
 // SetEnumStringRequired sets field value
-func (o *EnumTest) SetEnumStringRequired(v string) {
+func (o *EnumTest) SetEnumStringRequired(v EnumTestEnumString) {
 	o.EnumStringRequired = v
 }
 
 // GetEnumInteger returns the EnumInteger field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumInteger() int32 {
+func (o *EnumTest) GetEnumInteger() EnumTestEnumInteger {
 	if o == nil || IsNil(o.EnumInteger) {
-		var ret int32
+		var ret EnumTestEnumInteger
 		return ret
 	}
 	return *o.EnumInteger
@@ -115,7 +115,7 @@ func (o *EnumTest) GetEnumInteger() int32 {
 
 // GetEnumIntegerOk returns a tuple with the EnumInteger field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumIntegerOk() (*int32, bool) {
+func (o *EnumTest) GetEnumIntegerOk() (*EnumTestEnumInteger, bool) {
 	if o == nil || IsNil(o.EnumInteger) {
 		return nil, false
 	}
@@ -131,15 +131,15 @@ func (o *EnumTest) HasEnumInteger() bool {
 	return false
 }
 
-// SetEnumInteger gets a reference to the given int32 and assigns it to the EnumInteger field.
-func (o *EnumTest) SetEnumInteger(v int32) {
+// SetEnumInteger gets a reference to the given EnumTestEnumInteger and assigns it to the EnumInteger field.
+func (o *EnumTest) SetEnumInteger(v EnumTestEnumInteger) {
 	o.EnumInteger = &v
 }
 
 // GetEnumNumber returns the EnumNumber field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumNumber() float64 {
+func (o *EnumTest) GetEnumNumber() TestEnumParametersEnumQueryDoubleParameter {
 	if o == nil || IsNil(o.EnumNumber) {
-		var ret float64
+		var ret TestEnumParametersEnumQueryDoubleParameter
 		return ret
 	}
 	return *o.EnumNumber
@@ -147,7 +147,7 @@ func (o *EnumTest) GetEnumNumber() float64 {
 
 // GetEnumNumberOk returns a tuple with the EnumNumber field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumNumberOk() (*float64, bool) {
+func (o *EnumTest) GetEnumNumberOk() (*TestEnumParametersEnumQueryDoubleParameter, bool) {
 	if o == nil || IsNil(o.EnumNumber) {
 		return nil, false
 	}
@@ -163,8 +163,8 @@ func (o *EnumTest) HasEnumNumber() bool {
 	return false
 }
 
-// SetEnumNumber gets a reference to the given float64 and assigns it to the EnumNumber field.
-func (o *EnumTest) SetEnumNumber(v float64) {
+// SetEnumNumber gets a reference to the given TestEnumParametersEnumQueryDoubleParameter and assigns it to the EnumNumber field.
+func (o *EnumTest) SetEnumNumber(v TestEnumParametersEnumQueryDoubleParameter) {
 	o.EnumNumber = &v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_enum_test_enum_integer.go b/samples/client/petstore/go/go-petstore/model_enum_test_enum_integer.go
new file mode 100644
index 000000000000..3cf3e88fc227
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_enum_test_enum_integer.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumTestEnumInteger the model 'EnumTestEnumInteger'
+type EnumTestEnumInteger int32
+
+// List of Enum_Test_enum_integer
+const (
+	_1 EnumTestEnumInteger = 1
+	_MINUS_1 EnumTestEnumInteger = -1
+)
+
+// All allowed values of EnumTestEnumInteger enum
+var AllowedEnumTestEnumIntegerEnumValues = []EnumTestEnumInteger{
+	1,
+	-1,
+}
+
+func (v *EnumTestEnumInteger) UnmarshalJSON(src []byte) error {
+	var value int32
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumTestEnumInteger(value)
+	for _, existing := range AllowedEnumTestEnumIntegerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumTestEnumInteger", value)
+}
+
+// NewEnumTestEnumIntegerFromValue returns a pointer to a valid EnumTestEnumInteger
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumTestEnumIntegerFromValue(v int32) (*EnumTestEnumInteger, error) {
+	ev := EnumTestEnumInteger(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumTestEnumInteger: valid values are %v", v, AllowedEnumTestEnumIntegerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumTestEnumInteger) IsValid() bool {
+	for _, existing := range AllowedEnumTestEnumIntegerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Enum_Test_enum_integer value
+func (v EnumTestEnumInteger) Ptr() *EnumTestEnumInteger {
+	return &v
+}
+
+type NullableEnumTestEnumInteger struct {
+	value *EnumTestEnumInteger
+	isSet bool
+}
+
+func (v NullableEnumTestEnumInteger) Get() *EnumTestEnumInteger {
+	return v.value
+}
+
+func (v *NullableEnumTestEnumInteger) Set(val *EnumTestEnumInteger) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumTestEnumInteger) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumTestEnumInteger) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumTestEnumInteger(val *EnumTestEnumInteger) *NullableEnumTestEnumInteger {
+	return &NullableEnumTestEnumInteger{value: val, isSet: true}
+}
+
+func (v NullableEnumTestEnumInteger) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumTestEnumInteger) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_enum_test_enum_string.go b/samples/client/petstore/go/go-petstore/model_enum_test_enum_string.go
new file mode 100644
index 000000000000..eeb2508d6ae9
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_enum_test_enum_string.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumTestEnumString the model 'EnumTestEnumString'
+type EnumTestEnumString string
+
+// List of Enum_Test_enum_string
+const (
+	UPPER EnumTestEnumString = "UPPER"
+	LOWER EnumTestEnumString = "lower"
+	EMPTY EnumTestEnumString = ""
+)
+
+// All allowed values of EnumTestEnumString enum
+var AllowedEnumTestEnumStringEnumValues = []EnumTestEnumString{
+	"UPPER",
+	"lower",
+	"",
+}
+
+func (v *EnumTestEnumString) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumTestEnumString(value)
+	for _, existing := range AllowedEnumTestEnumStringEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumTestEnumString", value)
+}
+
+// NewEnumTestEnumStringFromValue returns a pointer to a valid EnumTestEnumString
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumTestEnumStringFromValue(v string) (*EnumTestEnumString, error) {
+	ev := EnumTestEnumString(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumTestEnumString: valid values are %v", v, AllowedEnumTestEnumStringEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumTestEnumString) IsValid() bool {
+	for _, existing := range AllowedEnumTestEnumStringEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Enum_Test_enum_string value
+func (v EnumTestEnumString) Ptr() *EnumTestEnumString {
+	return &v
+}
+
+type NullableEnumTestEnumString struct {
+	value *EnumTestEnumString
+	isSet bool
+}
+
+func (v NullableEnumTestEnumString) Get() *EnumTestEnumString {
+	return v.value
+}
+
+func (v *NullableEnumTestEnumString) Set(val *EnumTestEnumString) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumTestEnumString) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumTestEnumString) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumTestEnumString(val *EnumTestEnumString) *NullableEnumTestEnumString {
+	return &NullableEnumTestEnumString{value: val, isSet: true}
+}
+
+func (v NullableEnumTestEnumString) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumTestEnumString) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go b/samples/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go
new file mode 100644
index 000000000000..8e3404f2c94e
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// FindPetsByStatusStatusParameterInner the model 'FindPetsByStatusStatusParameterInner'
+type FindPetsByStatusStatusParameterInner string
+
+// List of findPetsByStatus_status_parameter_inner
+const (
+	AVAILABLE FindPetsByStatusStatusParameterInner = "available"
+	PENDING FindPetsByStatusStatusParameterInner = "pending"
+	SOLD FindPetsByStatusStatusParameterInner = "sold"
+)
+
+// All allowed values of FindPetsByStatusStatusParameterInner enum
+var AllowedFindPetsByStatusStatusParameterInnerEnumValues = []FindPetsByStatusStatusParameterInner{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *FindPetsByStatusStatusParameterInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := FindPetsByStatusStatusParameterInner(value)
+	for _, existing := range AllowedFindPetsByStatusStatusParameterInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid FindPetsByStatusStatusParameterInner", value)
+}
+
+// NewFindPetsByStatusStatusParameterInnerFromValue returns a pointer to a valid FindPetsByStatusStatusParameterInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewFindPetsByStatusStatusParameterInnerFromValue(v string) (*FindPetsByStatusStatusParameterInner, error) {
+	ev := FindPetsByStatusStatusParameterInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for FindPetsByStatusStatusParameterInner: valid values are %v", v, AllowedFindPetsByStatusStatusParameterInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v FindPetsByStatusStatusParameterInner) IsValid() bool {
+	for _, existing := range AllowedFindPetsByStatusStatusParameterInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to findPetsByStatus_status_parameter_inner value
+func (v FindPetsByStatusStatusParameterInner) Ptr() *FindPetsByStatusStatusParameterInner {
+	return &v
+}
+
+type NullableFindPetsByStatusStatusParameterInner struct {
+	value *FindPetsByStatusStatusParameterInner
+	isSet bool
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) Get() *FindPetsByStatusStatusParameterInner {
+	return v.value
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) Set(val *FindPetsByStatusStatusParameterInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableFindPetsByStatusStatusParameterInner(val *FindPetsByStatusStatusParameterInner) *NullableFindPetsByStatusStatusParameterInner {
+	return &NullableFindPetsByStatusStatusParameterInner{value: val, isSet: true}
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_map_test_.go b/samples/client/petstore/go/go-petstore/model_map_test_.go
index 78ca3949a67e..a9cbbd5f1227 100644
--- a/samples/client/petstore/go/go-petstore/model_map_test_.go
+++ b/samples/client/petstore/go/go-petstore/model_map_test_.go
@@ -20,7 +20,7 @@ var _ MappedNullable = &MapTest{}
 // MapTest struct for MapTest
 type MapTest struct {
 	MapMapOfString *map[string]map[string]string `json:"map_map_of_string,omitempty"`
-	MapOfEnumString *map[string]string `json:"map_of_enum_string,omitempty"`
+	MapOfEnumString *map[string]MapTestMapOfEnumStringValue `json:"map_of_enum_string,omitempty"`
 	DirectMap *map[string]bool `json:"direct_map,omitempty"`
 	IndirectMap *map[string]bool `json:"indirect_map,omitempty"`
 }
@@ -75,9 +75,9 @@ func (o *MapTest) SetMapMapOfString(v map[string]map[string]string) {
 }
 
 // GetMapOfEnumString returns the MapOfEnumString field value if set, zero value otherwise.
-func (o *MapTest) GetMapOfEnumString() map[string]string {
+func (o *MapTest) GetMapOfEnumString() map[string]MapTestMapOfEnumStringValue {
 	if o == nil || IsNil(o.MapOfEnumString) {
-		var ret map[string]string
+		var ret map[string]MapTestMapOfEnumStringValue
 		return ret
 	}
 	return *o.MapOfEnumString
@@ -85,7 +85,7 @@ func (o *MapTest) GetMapOfEnumString() map[string]string {
 
 // GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MapTest) GetMapOfEnumStringOk() (*map[string]string, bool) {
+func (o *MapTest) GetMapOfEnumStringOk() (*map[string]MapTestMapOfEnumStringValue, bool) {
 	if o == nil || IsNil(o.MapOfEnumString) {
 		return nil, false
 	}
@@ -101,8 +101,8 @@ func (o *MapTest) HasMapOfEnumString() bool {
 	return false
 }
 
-// SetMapOfEnumString gets a reference to the given map[string]string and assigns it to the MapOfEnumString field.
-func (o *MapTest) SetMapOfEnumString(v map[string]string) {
+// SetMapOfEnumString gets a reference to the given map[string]MapTestMapOfEnumStringValue and assigns it to the MapOfEnumString field.
+func (o *MapTest) SetMapOfEnumString(v map[string]MapTestMapOfEnumStringValue) {
 	o.MapOfEnumString = &v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go b/samples/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go
new file mode 100644
index 000000000000..1bdd458e8a2b
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// MapTestMapOfEnumStringValue the model 'MapTestMapOfEnumStringValue'
+type MapTestMapOfEnumStringValue string
+
+// List of MapTest_map_of_enum_string_value
+const (
+	UPPER MapTestMapOfEnumStringValue = "UPPER"
+	LOWER MapTestMapOfEnumStringValue = "lower"
+)
+
+// All allowed values of MapTestMapOfEnumStringValue enum
+var AllowedMapTestMapOfEnumStringValueEnumValues = []MapTestMapOfEnumStringValue{
+	"UPPER",
+	"lower",
+}
+
+func (v *MapTestMapOfEnumStringValue) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := MapTestMapOfEnumStringValue(value)
+	for _, existing := range AllowedMapTestMapOfEnumStringValueEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid MapTestMapOfEnumStringValue", value)
+}
+
+// NewMapTestMapOfEnumStringValueFromValue returns a pointer to a valid MapTestMapOfEnumStringValue
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewMapTestMapOfEnumStringValueFromValue(v string) (*MapTestMapOfEnumStringValue, error) {
+	ev := MapTestMapOfEnumStringValue(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for MapTestMapOfEnumStringValue: valid values are %v", v, AllowedMapTestMapOfEnumStringValueEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v MapTestMapOfEnumStringValue) IsValid() bool {
+	for _, existing := range AllowedMapTestMapOfEnumStringValueEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to MapTest_map_of_enum_string_value value
+func (v MapTestMapOfEnumStringValue) Ptr() *MapTestMapOfEnumStringValue {
+	return &v
+}
+
+type NullableMapTestMapOfEnumStringValue struct {
+	value *MapTestMapOfEnumStringValue
+	isSet bool
+}
+
+func (v NullableMapTestMapOfEnumStringValue) Get() *MapTestMapOfEnumStringValue {
+	return v.value
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) Set(val *MapTestMapOfEnumStringValue) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableMapTestMapOfEnumStringValue) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableMapTestMapOfEnumStringValue(val *MapTestMapOfEnumStringValue) *NullableMapTestMapOfEnumStringValue {
+	return &NullableMapTestMapOfEnumStringValue{value: val, isSet: true}
+}
+
+func (v NullableMapTestMapOfEnumStringValue) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_order.go b/samples/client/petstore/go/go-petstore/model_order.go
index d403c6113332..532e3d64f3ec 100644
--- a/samples/client/petstore/go/go-petstore/model_order.go
+++ b/samples/client/petstore/go/go-petstore/model_order.go
@@ -24,8 +24,7 @@ type Order struct {
 	PetId *int64 `json:"petId,omitempty"`
 	Quantity *int32 `json:"quantity,omitempty"`
 	ShipDate *time.Time `json:"shipDate,omitempty"`
-	// Order Status
-	Status *string `json:"status,omitempty"`
+	Status *OrderStatus `json:"status,omitempty"`
 	Complete *bool `json:"complete,omitempty"`
 }
 
@@ -179,9 +178,9 @@ func (o *Order) SetShipDate(v time.Time) {
 }
 
 // GetStatus returns the Status field value if set, zero value otherwise.
-func (o *Order) GetStatus() string {
+func (o *Order) GetStatus() OrderStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret OrderStatus
 		return ret
 	}
 	return *o.Status
@@ -189,7 +188,7 @@ func (o *Order) GetStatus() string {
 
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Order) GetStatusOk() (*string, bool) {
+func (o *Order) GetStatusOk() (*OrderStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -205,8 +204,8 @@ func (o *Order) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
-func (o *Order) SetStatus(v string) {
+// SetStatus gets a reference to the given OrderStatus and assigns it to the Status field.
+func (o *Order) SetStatus(v OrderStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_order_status.go b/samples/client/petstore/go/go-petstore/model_order_status.go
new file mode 100644
index 000000000000..d887c17cb217
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_order_status.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// OrderStatus Order Status
+type OrderStatus string
+
+// List of Order_status
+const (
+	PLACED OrderStatus = "placed"
+	APPROVED OrderStatus = "approved"
+	DELIVERED OrderStatus = "delivered"
+)
+
+// All allowed values of OrderStatus enum
+var AllowedOrderStatusEnumValues = []OrderStatus{
+	"placed",
+	"approved",
+	"delivered",
+}
+
+func (v *OrderStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := OrderStatus(value)
+	for _, existing := range AllowedOrderStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid OrderStatus", value)
+}
+
+// NewOrderStatusFromValue returns a pointer to a valid OrderStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewOrderStatusFromValue(v string) (*OrderStatus, error) {
+	ev := OrderStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for OrderStatus: valid values are %v", v, AllowedOrderStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v OrderStatus) IsValid() bool {
+	for _, existing := range AllowedOrderStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Order_status value
+func (v OrderStatus) Ptr() *OrderStatus {
+	return &v
+}
+
+type NullableOrderStatus struct {
+	value *OrderStatus
+	isSet bool
+}
+
+func (v NullableOrderStatus) Get() *OrderStatus {
+	return v.value
+}
+
+func (v *NullableOrderStatus) Set(val *OrderStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableOrderStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableOrderStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableOrderStatus(val *OrderStatus) *NullableOrderStatus {
+	return &NullableOrderStatus{value: val, isSet: true}
+}
+
+func (v NullableOrderStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableOrderStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_pet.go b/samples/client/petstore/go/go-petstore/model_pet.go
index de782511daa3..333c0973103e 100644
--- a/samples/client/petstore/go/go-petstore/model_pet.go
+++ b/samples/client/petstore/go/go-petstore/model_pet.go
@@ -26,8 +26,7 @@ type Pet struct {
 	Name string `json:"name"`
 	PhotoUrls []string `json:"photoUrls"`
 	Tags []Tag `json:"tags,omitempty"`
-	// pet status in the store
-	Status *string `json:"status,omitempty"`
+	Status *PetStatus `json:"status,omitempty"`
 }
 
 type _Pet Pet
@@ -196,9 +195,9 @@ func (o *Pet) SetTags(v []Tag) {
 }
 
 // GetStatus returns the Status field value if set, zero value otherwise.
-func (o *Pet) GetStatus() string {
+func (o *Pet) GetStatus() PetStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret PetStatus
 		return ret
 	}
 	return *o.Status
@@ -206,7 +205,7 @@ func (o *Pet) GetStatus() string {
 
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Pet) GetStatusOk() (*string, bool) {
+func (o *Pet) GetStatusOk() (*PetStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -222,8 +221,8 @@ func (o *Pet) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
-func (o *Pet) SetStatus(v string) {
+// SetStatus gets a reference to the given PetStatus and assigns it to the Status field.
+func (o *Pet) SetStatus(v PetStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/client/petstore/go/go-petstore/model_pet_status.go b/samples/client/petstore/go/go-petstore/model_pet_status.go
new file mode 100644
index 000000000000..622c85a6519a
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_pet_status.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// PetStatus pet status in the store
+type PetStatus string
+
+// List of Pet_status
+const (
+	AVAILABLE PetStatus = "available"
+	PENDING PetStatus = "pending"
+	SOLD PetStatus = "sold"
+)
+
+// All allowed values of PetStatus enum
+var AllowedPetStatusEnumValues = []PetStatus{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *PetStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := PetStatus(value)
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid PetStatus", value)
+}
+
+// NewPetStatusFromValue returns a pointer to a valid PetStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewPetStatusFromValue(v string) (*PetStatus, error) {
+	ev := PetStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for PetStatus: valid values are %v", v, AllowedPetStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v PetStatus) IsValid() bool {
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Pet_status value
+func (v PetStatus) Ptr() *PetStatus {
+	return &v
+}
+
+type NullablePetStatus struct {
+	value *PetStatus
+	isSet bool
+}
+
+func (v NullablePetStatus) Get() *PetStatus {
+	return v.value
+}
+
+func (v *NullablePetStatus) Set(val *PetStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePetStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePetStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePetStatus(val *PetStatus) *NullablePetStatus {
+	return &NullablePetStatus{value: val, isSet: true}
+}
+
+func (v NullablePetStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePetStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go
new file mode 100644
index 000000000000..a1a12a6edb83
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumHeaderStringParameter the model 'TestEnumParametersEnumHeaderStringParameter'
+type TestEnumParametersEnumHeaderStringParameter string
+
+// List of testEnumParameters_enum_header_string_parameter
+const (
+	ABC TestEnumParametersEnumHeaderStringParameter = "_abc"
+	EFG TestEnumParametersEnumHeaderStringParameter = "-efg"
+	XYZ TestEnumParametersEnumHeaderStringParameter = "(xyz)"
+)
+
+// All allowed values of TestEnumParametersEnumHeaderStringParameter enum
+var AllowedTestEnumParametersEnumHeaderStringParameterEnumValues = []TestEnumParametersEnumHeaderStringParameter{
+	"_abc",
+	"-efg",
+	"(xyz)",
+}
+
+func (v *TestEnumParametersEnumHeaderStringParameter) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumHeaderStringParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumHeaderStringParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumHeaderStringParameter", value)
+}
+
+// NewTestEnumParametersEnumHeaderStringParameterFromValue returns a pointer to a valid TestEnumParametersEnumHeaderStringParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumHeaderStringParameterFromValue(v string) (*TestEnumParametersEnumHeaderStringParameter, error) {
+	ev := TestEnumParametersEnumHeaderStringParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumHeaderStringParameter: valid values are %v", v, AllowedTestEnumParametersEnumHeaderStringParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumHeaderStringParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumHeaderStringParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_header_string_parameter value
+func (v TestEnumParametersEnumHeaderStringParameter) Ptr() *TestEnumParametersEnumHeaderStringParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumHeaderStringParameter struct {
+	value *TestEnumParametersEnumHeaderStringParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) Get() *TestEnumParametersEnumHeaderStringParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) Set(val *TestEnumParametersEnumHeaderStringParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumHeaderStringParameter(val *TestEnumParametersEnumHeaderStringParameter) *NullableTestEnumParametersEnumHeaderStringParameter {
+	return &NullableTestEnumParametersEnumHeaderStringParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go
new file mode 100644
index 000000000000..e32a9ddf4107
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumQueryDoubleParameter the model 'TestEnumParametersEnumQueryDoubleParameter'
+type TestEnumParametersEnumQueryDoubleParameter double
+
+// List of testEnumParameters_enum_query_double_parameter
+const (
+	_1_DOT_1 TestEnumParametersEnumQueryDoubleParameter = 1.1
+	_MINUS_1_DOT_2 TestEnumParametersEnumQueryDoubleParameter = -1.2
+)
+
+// All allowed values of TestEnumParametersEnumQueryDoubleParameter enum
+var AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues = []TestEnumParametersEnumQueryDoubleParameter{
+	1.1,
+	-1.2,
+}
+
+func (v *TestEnumParametersEnumQueryDoubleParameter) UnmarshalJSON(src []byte) error {
+	var value double
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumQueryDoubleParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumQueryDoubleParameter", value)
+}
+
+// NewTestEnumParametersEnumQueryDoubleParameterFromValue returns a pointer to a valid TestEnumParametersEnumQueryDoubleParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumQueryDoubleParameterFromValue(v double) (*TestEnumParametersEnumQueryDoubleParameter, error) {
+	ev := TestEnumParametersEnumQueryDoubleParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumQueryDoubleParameter: valid values are %v", v, AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumQueryDoubleParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_query_double_parameter value
+func (v TestEnumParametersEnumQueryDoubleParameter) Ptr() *TestEnumParametersEnumQueryDoubleParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumQueryDoubleParameter struct {
+	value *TestEnumParametersEnumQueryDoubleParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) Get() *TestEnumParametersEnumQueryDoubleParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) Set(val *TestEnumParametersEnumQueryDoubleParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumQueryDoubleParameter(val *TestEnumParametersEnumQueryDoubleParameter) *NullableTestEnumParametersEnumQueryDoubleParameter {
+	return &NullableTestEnumParametersEnumQueryDoubleParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go
new file mode 100644
index 000000000000..95f6fbd9186c
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumQueryIntegerParameter the model 'TestEnumParametersEnumQueryIntegerParameter'
+type TestEnumParametersEnumQueryIntegerParameter int32
+
+// List of testEnumParameters_enum_query_integer_parameter
+const (
+	_1 TestEnumParametersEnumQueryIntegerParameter = 1
+	_MINUS_2 TestEnumParametersEnumQueryIntegerParameter = -2
+)
+
+// All allowed values of TestEnumParametersEnumQueryIntegerParameter enum
+var AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues = []TestEnumParametersEnumQueryIntegerParameter{
+	1,
+	-2,
+}
+
+func (v *TestEnumParametersEnumQueryIntegerParameter) UnmarshalJSON(src []byte) error {
+	var value int32
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumQueryIntegerParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumQueryIntegerParameter", value)
+}
+
+// NewTestEnumParametersEnumQueryIntegerParameterFromValue returns a pointer to a valid TestEnumParametersEnumQueryIntegerParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumQueryIntegerParameterFromValue(v int32) (*TestEnumParametersEnumQueryIntegerParameter, error) {
+	ev := TestEnumParametersEnumQueryIntegerParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumQueryIntegerParameter: valid values are %v", v, AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumQueryIntegerParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_query_integer_parameter value
+func (v TestEnumParametersEnumQueryIntegerParameter) Ptr() *TestEnumParametersEnumQueryIntegerParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumQueryIntegerParameter struct {
+	value *TestEnumParametersEnumQueryIntegerParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) Get() *TestEnumParametersEnumQueryIntegerParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) Set(val *TestEnumParametersEnumQueryIntegerParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumQueryIntegerParameter(val *TestEnumParametersEnumQueryIntegerParameter) *NullableTestEnumParametersEnumQueryIntegerParameter {
+	return &NullableTestEnumParametersEnumQueryIntegerParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go
new file mode 100644
index 000000000000..d78a97c9b92f
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersRequestEnumFormString Form parameter enum test (string)
+type TestEnumParametersRequestEnumFormString string
+
+// List of testEnumParameters_request_enum_form_string
+const (
+	ABC TestEnumParametersRequestEnumFormString = "_abc"
+	EFG TestEnumParametersRequestEnumFormString = "-efg"
+	XYZ TestEnumParametersRequestEnumFormString = "(xyz)"
+)
+
+// All allowed values of TestEnumParametersRequestEnumFormString enum
+var AllowedTestEnumParametersRequestEnumFormStringEnumValues = []TestEnumParametersRequestEnumFormString{
+	"_abc",
+	"-efg",
+	"(xyz)",
+}
+
+func (v *TestEnumParametersRequestEnumFormString) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersRequestEnumFormString(value)
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersRequestEnumFormString", value)
+}
+
+// NewTestEnumParametersRequestEnumFormStringFromValue returns a pointer to a valid TestEnumParametersRequestEnumFormString
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersRequestEnumFormStringFromValue(v string) (*TestEnumParametersRequestEnumFormString, error) {
+	ev := TestEnumParametersRequestEnumFormString(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersRequestEnumFormString: valid values are %v", v, AllowedTestEnumParametersRequestEnumFormStringEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersRequestEnumFormString) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_request_enum_form_string value
+func (v TestEnumParametersRequestEnumFormString) Ptr() *TestEnumParametersRequestEnumFormString {
+	return &v
+}
+
+type NullableTestEnumParametersRequestEnumFormString struct {
+	value *TestEnumParametersRequestEnumFormString
+	isSet bool
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) Get() *TestEnumParametersRequestEnumFormString {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) Set(val *TestEnumParametersRequestEnumFormString) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersRequestEnumFormString(val *TestEnumParametersRequestEnumFormString) *NullableTestEnumParametersRequestEnumFormString {
+	return &NullableTestEnumParametersRequestEnumFormString{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go
new file mode 100644
index 000000000000..5b7538a85413
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersRequestEnumFormStringArrayInner the model 'TestEnumParametersRequestEnumFormStringArrayInner'
+type TestEnumParametersRequestEnumFormStringArrayInner string
+
+// List of testEnumParameters_request_enum_form_string_array_inner
+const (
+	GREATER_THAN TestEnumParametersRequestEnumFormStringArrayInner = ">"
+	DOLLAR TestEnumParametersRequestEnumFormStringArrayInner = "$"
+)
+
+// All allowed values of TestEnumParametersRequestEnumFormStringArrayInner enum
+var AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues = []TestEnumParametersRequestEnumFormStringArrayInner{
+	">",
+	"$",
+}
+
+func (v *TestEnumParametersRequestEnumFormStringArrayInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersRequestEnumFormStringArrayInner(value)
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersRequestEnumFormStringArrayInner", value)
+}
+
+// NewTestEnumParametersRequestEnumFormStringArrayInnerFromValue returns a pointer to a valid TestEnumParametersRequestEnumFormStringArrayInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersRequestEnumFormStringArrayInnerFromValue(v string) (*TestEnumParametersRequestEnumFormStringArrayInner, error) {
+	ev := TestEnumParametersRequestEnumFormStringArrayInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersRequestEnumFormStringArrayInner: valid values are %v", v, AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersRequestEnumFormStringArrayInner) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_request_enum_form_string_array_inner value
+func (v TestEnumParametersRequestEnumFormStringArrayInner) Ptr() *TestEnumParametersRequestEnumFormStringArrayInner {
+	return &v
+}
+
+type NullableTestEnumParametersRequestEnumFormStringArrayInner struct {
+	value *TestEnumParametersRequestEnumFormStringArrayInner
+	isSet bool
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) Get() *TestEnumParametersRequestEnumFormStringArrayInner {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) Set(val *TestEnumParametersRequestEnumFormStringArrayInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersRequestEnumFormStringArrayInner(val *TestEnumParametersRequestEnumFormStringArrayInner) *NullableTestEnumParametersRequestEnumFormStringArrayInner {
+	return &NullableTestEnumParametersRequestEnumFormStringArrayInner{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/.openapi-generator/FILES b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/.openapi-generator/FILES
index c6b0a6bd16db..af273900db4b 100644
--- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/.openapi-generator/FILES
@@ -8,12 +8,14 @@ configuration.go
 docs/Category.md
 docs/Pet.md
 docs/PetAPI.md
+docs/PetStatus.md
 docs/Tag.md
 git_push.sh
 go.mod
 go.sum
 model_category.go
 model_pet.go
+model_pet_status.go
 model_tag.go
 response.go
 utils.go
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/README.md b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/README.md
index 30e20544597c..d400f7ffa36d 100644
--- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/README.md
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/README.md
@@ -86,6 +86,7 @@ Class | Method | HTTP request | Description
 
  - [Category](docs/Category.md)
  - [Pet](docs/Pet.md)
+ - [PetStatus](docs/PetStatus.md)
  - [Tag](docs/Tag.md)
 
 
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml
index 25e6b6ed012a..81997d99b527 100644
--- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml
@@ -126,13 +126,7 @@ components:
             name: tag
             wrapped: true
         status:
-          deprecated: true
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
+          $ref: "#/components/schemas/Pet_status"
       required:
       - name
       - photoUrls
@@ -140,6 +134,14 @@ components:
       type: object
       xml:
         name: Pet
+    Pet_status:
+      deprecated: true
+      description: pet status in the store
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
   securitySchemes:
     petstore_auth:
       flows:
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/Pet.md b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/Pet.md
index a6eae34657d3..9c5ceb9f2e34 100644
--- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/Pet.md
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **Name** | **string** |  | 
 **PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | Pointer to **string** | pet status in the store | [optional] 
+**Status** | Pointer to [**PetStatus**](PetStatus.md) |  | [optional] 
 
 ## Methods
 
@@ -147,20 +147,20 @@ HasTags returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Pet) GetStatus() string`
+`func (o *Pet) GetStatus() PetStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Pet) GetStatusOk() (*string, bool)`
+`func (o *Pet) GetStatusOk() (*PetStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Pet) SetStatus(v string)`
+`func (o *Pet) SetStatus(v PetStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/PetStatus.md b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/PetStatus.md
new file mode 100644
index 000000000000..9b41cdb3b685
--- /dev/null
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/docs/PetStatus.md
@@ -0,0 +1,15 @@
+# PetStatus
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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-petstore-generateMarshalJSON-false/model_pet.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet.go
index 77983744402d..3c32a4866453 100644
--- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet.go
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet.go
@@ -25,9 +25,8 @@ type Pet struct {
 	Name string `json:"name"`
 	PhotoUrls []string `json:"photoUrls"`
 	Tags []Tag `json:"tags,omitempty"`
-	// pet status in the store
 	// Deprecated
-	Status *string `json:"status,omitempty"`
+	Status *PetStatus `json:"status,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
 
@@ -198,9 +197,9 @@ func (o *Pet) SetTags(v []Tag) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 // Deprecated
-func (o *Pet) GetStatus() string {
+func (o *Pet) GetStatus() PetStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret PetStatus
 		return ret
 	}
 	return *o.Status
@@ -209,7 +208,7 @@ func (o *Pet) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 // Deprecated
-func (o *Pet) GetStatusOk() (*string, bool) {
+func (o *Pet) GetStatusOk() (*PetStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -225,9 +224,9 @@ func (o *Pet) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
+// SetStatus gets a reference to the given PetStatus and assigns it to the Status field.
 // Deprecated
-func (o *Pet) SetStatus(v string) {
+func (o *Pet) SetStatus(v PetStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet_status.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet_status.go
new file mode 100644
index 000000000000..3503c6e5073a
--- /dev/null
+++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/model_pet_status.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// PetStatus pet status in the store
+type PetStatus string
+
+// List of Pet_status
+const (
+	PETSTATUS_AVAILABLE PetStatus = "available"
+	PETSTATUS_PENDING PetStatus = "pending"
+	PETSTATUS_SOLD PetStatus = "sold"
+)
+
+// All allowed values of PetStatus enum
+var AllowedPetStatusEnumValues = []PetStatus{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *PetStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := PetStatus(value)
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid PetStatus", value)
+}
+
+// NewPetStatusFromValue returns a pointer to a valid PetStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewPetStatusFromValue(v string) (*PetStatus, error) {
+	ev := PetStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for PetStatus: valid values are %v", v, AllowedPetStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v PetStatus) IsValid() bool {
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Pet_status value
+func (v PetStatus) Ptr() *PetStatus {
+	return &v
+}
+
+type NullablePetStatus struct {
+	value *PetStatus
+	isSet bool
+}
+
+func (v NullablePetStatus) Get() *PetStatus {
+	return v.value
+}
+
+func (v *NullablePetStatus) Set(val *PetStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePetStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePetStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePetStatus(val *PetStatus) *NullablePetStatus {
+	return &NullablePetStatus{value: val, isSet: true}
+}
+
+func (v NullablePetStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePetStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
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 e6cac5bc3f30..83277f661007 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES
@@ -34,8 +34,12 @@ docs/Dog.md
 docs/DuplicatedPropChild.md
 docs/DuplicatedPropParent.md
 docs/EnumArrays.md
+docs/EnumArraysArrayEnumInner.md
+docs/EnumArraysJustSymbol.md
 docs/EnumClass.md
 docs/EnumTest.md
+docs/EnumTestEnumInteger.md
+docs/EnumTestEnumString.md
 docs/FakeAPI.md
 docs/FakeClassnameTags123API.md
 docs/File.md
@@ -43,6 +47,7 @@ docs/FileSchemaTestClass.md
 docs/FilterAny.md
 docs/FilterTypeRange.md
 docs/FilterTypeRegex.md
+docs/FindPetsByStatusStatusParameterInner.md
 docs/Foo.md
 docs/FooGetDefaultResponse.md
 docs/FormatTest.md
@@ -58,6 +63,7 @@ docs/List.md
 docs/Mammal.md
 docs/MapOfFileTest.md
 docs/MapTest.md
+docs/MapTestMapOfEnumStringValue.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
 docs/Name.md
@@ -70,6 +76,7 @@ docs/OneOfPrimitiveTypeChild.md
 docs/OneOfPrimitiveTypes.md
 docs/OneOfWithComplexType.md
 docs/Order.md
+docs/OrderStatus.md
 docs/OuterComposite.md
 docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
@@ -77,6 +84,7 @@ docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
 docs/Pet.md
 docs/PetAPI.md
+docs/PetStatus.md
 docs/PropertyNameMapping.md
 docs/ReadOnlyFirst.md
 docs/ReadOnlyWithDefault.md
@@ -85,11 +93,17 @@ docs/SomeOpsRequiringRefIntRequest.md
 docs/SpecialModelName.md
 docs/StoreAPI.md
 docs/Tag.md
+docs/TestEnumParametersEnumHeaderStringParameter.md
+docs/TestEnumParametersEnumQueryDoubleParameter.md
+docs/TestEnumParametersEnumQueryIntegerParameter.md
+docs/TestEnumParametersRequestEnumFormString.md
+docs/TestEnumParametersRequestEnumFormStringArrayInner.md
 docs/TestInlineFreeformAdditionalPropertiesRequest.md
 docs/User.md
 docs/UserAPI.md
 docs/Whale.md
 docs/Zebra.md
+docs/ZebraType.md
 git_push.sh
 go.mod
 go.sum
@@ -117,13 +131,18 @@ model_dog.go
 model_duplicated_prop_child.go
 model_duplicated_prop_parent.go
 model_enum_arrays.go
+model_enum_arrays_array_enum_inner.go
+model_enum_arrays_just_symbol.go
 model_enum_class.go
 model_enum_test_.go
+model_enum_test_enum_integer.go
+model_enum_test_enum_string.go
 model_file.go
 model_file_schema_test_class.go
 model_filter_any.go
 model_filter_type_range.go
 model_filter_type_regex.go
+model_find_pets_by_status_status_parameter_inner.go
 model_foo.go
 model_format_test_.go
 model_fruit.go
@@ -138,6 +157,7 @@ model_list.go
 model_mammal.go
 model_map_of_file_test_.go
 model_map_test_.go
+model_map_test_map_of_enum_string_value.go
 model_mixed_properties_and_additional_properties_class.go
 model_name.go
 model_nullable_all_of.go
@@ -149,22 +169,30 @@ model_one_of_primitive_type_child.go
 model_one_of_primitive_types.go
 model_one_of_with_complex_type.go
 model_order.go
+model_order_status.go
 model_outer_composite.go
 model_outer_enum.go
 model_outer_enum_default_value.go
 model_outer_enum_integer.go
 model_outer_enum_integer_default_value.go
 model_pet.go
+model_pet_status.go
 model_property_name_mapping.go
 model_read_only_first.go
 model_read_only_with_default.go
 model_return.go
 model_some_ops_requiring_ref_int_request.go
 model_tag.go
+model_test_enum_parameters_enum_header_string_parameter.go
+model_test_enum_parameters_enum_query_double_parameter.go
+model_test_enum_parameters_enum_query_integer_parameter.go
+model_test_enum_parameters_request_enum_form_string.go
+model_test_enum_parameters_request_enum_form_string_array_inner.go
 model_test_inline_freeform_additional_properties_request.go
 model_user.go
 model_whale.go
 model_zebra.go
+model_zebra_type.go
 response.go
 signing.go
 utils.go
diff --git a/samples/openapi3/client/petstore/go/go-petstore/README.md b/samples/openapi3/client/petstore/go/go-petstore/README.md
index 46a14ba1b839..fb3909d9c6dd 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/README.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/README.md
@@ -150,13 +150,18 @@ Class | Method | HTTP request | Description
  - [DuplicatedPropChild](docs/DuplicatedPropChild.md)
  - [DuplicatedPropParent](docs/DuplicatedPropParent.md)
  - [EnumArrays](docs/EnumArrays.md)
+ - [EnumArraysArrayEnumInner](docs/EnumArraysArrayEnumInner.md)
+ - [EnumArraysJustSymbol](docs/EnumArraysJustSymbol.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
+ - [EnumTestEnumInteger](docs/EnumTestEnumInteger.md)
+ - [EnumTestEnumString](docs/EnumTestEnumString.md)
  - [File](docs/File.md)
  - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [FilterAny](docs/FilterAny.md)
  - [FilterTypeRange](docs/FilterTypeRange.md)
  - [FilterTypeRegex](docs/FilterTypeRegex.md)
+ - [FindPetsByStatusStatusParameterInner](docs/FindPetsByStatusStatusParameterInner.md)
  - [Foo](docs/Foo.md)
  - [FooGetDefaultResponse](docs/FooGetDefaultResponse.md)
  - [FormatTest](docs/FormatTest.md)
@@ -172,6 +177,7 @@ Class | Method | HTTP request | Description
  - [Mammal](docs/Mammal.md)
  - [MapOfFileTest](docs/MapOfFileTest.md)
  - [MapTest](docs/MapTest.md)
+ - [MapTestMapOfEnumStringValue](docs/MapTestMapOfEnumStringValue.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [Name](docs/Name.md)
@@ -184,12 +190,14 @@ Class | Method | HTTP request | Description
  - [OneOfPrimitiveTypes](docs/OneOfPrimitiveTypes.md)
  - [OneOfWithComplexType](docs/OneOfWithComplexType.md)
  - [Order](docs/Order.md)
+ - [OrderStatus](docs/OrderStatus.md)
  - [OuterComposite](docs/OuterComposite.md)
  - [OuterEnum](docs/OuterEnum.md)
  - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [OuterEnumInteger](docs/OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
  - [Pet](docs/Pet.md)
+ - [PetStatus](docs/PetStatus.md)
  - [PropertyNameMapping](docs/PropertyNameMapping.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [ReadOnlyWithDefault](docs/ReadOnlyWithDefault.md)
@@ -197,10 +205,16 @@ Class | Method | HTTP request | Description
  - [SomeOpsRequiringRefIntRequest](docs/SomeOpsRequiringRefIntRequest.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
+ - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
+ - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
+ - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
+ - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
+ - [TestEnumParametersRequestEnumFormStringArrayInner](docs/TestEnumParametersRequestEnumFormStringArrayInner.md)
  - [TestInlineFreeformAdditionalPropertiesRequest](docs/TestInlineFreeformAdditionalPropertiesRequest.md)
  - [User](docs/User.md)
  - [Whale](docs/Whale.md)
  - [Zebra](docs/Zebra.md)
+ - [ZebraType](docs/ZebraType.md)
 
 
 ## Documentation For Authorization
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 2ee0e78cdfb9..916441ef6d99 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -115,12 +115,7 @@ paths:
         required: true
         schema:
           items:
-            default: available
-            enum:
-            - available
-            - pending
-            - sold
-            type: string
+            $ref: "#/components/schemas/findPetsByStatus_status_parameter_inner"
           type: array
         style: form
       responses:
@@ -690,11 +685,7 @@ paths:
         required: false
         schema:
           items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         style: simple
       - description: Header parameter enum test (string)
@@ -703,12 +694,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -717,11 +703,7 @@ paths:
         required: false
         schema:
           items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         style: form
       - description: Query parameter enum test (string)
@@ -730,12 +712,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          default: -efg
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
+          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -743,11 +720,7 @@ paths:
         name: enum_query_integer
         required: false
         schema:
-          enum:
-          - 1
-          - -2
-          format: int32
-          type: integer
+          $ref: "#/components/schemas/testEnumParameters_enum_query_integer_parameter"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -755,11 +728,7 @@ paths:
         name: enum_query_double
         required: false
         schema:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
+          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
         style: form
       requestBody:
         content:
@@ -1381,12 +1350,7 @@ components:
           format: date-time
           type: string
         status:
-          description: Order Status
-          enum:
-          - placed
-          - approved
-          - delivered
-          type: string
+          $ref: "#/components/schemas/Order_status"
         complete:
           default: false
           type: boolean
@@ -1517,13 +1481,7 @@ components:
             name: tag
             wrapped: true
         status:
-          deprecated: true
-          description: pet status in the store
-          enum:
-          - available
-          - pending
-          - sold
-          type: string
+          $ref: "#/components/schemas/Pet_status"
       required:
       - name
       - photoUrls
@@ -1702,29 +1660,13 @@ components:
     Enum_Test:
       properties:
         enum_string:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
+          $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_string_required:
-          enum:
-          - UPPER
-          - lower
-          - ""
-          type: string
+          $ref: "#/components/schemas/Enum_Test_enum_string"
         enum_integer:
-          enum:
-          - 1
-          - -1
-          format: int32
-          type: integer
+          $ref: "#/components/schemas/Enum_Test_enum_integer"
         enum_number:
-          enum:
-          - 1.1
-          - -1.2
-          format: double
-          type: number
+          $ref: "#/components/schemas/testEnumParameters_enum_query_double_parameter"
         outerEnum:
           $ref: "#/components/schemas/OuterEnum"
         outerEnumInteger:
@@ -1818,10 +1760,7 @@ components:
           type: object
         map_of_enum_string:
           additionalProperties:
-            enum:
-            - UPPER
-            - lower
-            type: string
+            $ref: "#/components/schemas/MapTest_map_of_enum_string_value"
           type: object
         direct_map:
           additionalProperties:
@@ -1876,16 +1815,10 @@ components:
     EnumArrays:
       properties:
         just_symbol:
-          enum:
-          - '>='
-          - $
-          type: string
+          $ref: "#/components/schemas/EnumArrays_just_symbol"
         array_enum:
           items:
-            enum:
-            - fish
-            - crab
-            type: string
+            $ref: "#/components/schemas/EnumArrays_array_enum_inner"
           type: array
       type: object
     FreeFormObject:
@@ -2090,11 +2023,7 @@ components:
     zebra:
       properties:
         type:
-          enum:
-          - plains
-          - mountain
-          - grevys
-          type: string
+          $ref: "#/components/schemas/zebra_type"
         className:
           type: string
       required:
@@ -2277,6 +2206,13 @@ components:
         string:
           $ref: "#/components/schemas/Foo"
       type: object
+    findPetsByStatus_status_parameter_inner:
+      default: available
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
     updatePetWithForm_request:
       properties:
         name:
@@ -2296,26 +2232,49 @@ components:
           format: binary
           type: string
       type: object
+    testEnumParameters_request_enum_form_string_array_inner:
+      default: $
+      enum:
+      - '>'
+      - $
+      type: string
+    testEnumParameters_request_enum_form_string:
+      default: -efg
+      description: Form parameter enum test (string)
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
     testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
           items:
-            default: $
-            enum:
-            - '>'
-            - $
-            type: string
+            $ref: "#/components/schemas/testEnumParameters_request_enum_form_string_array_inner"
           type: array
         enum_form_string:
-          default: -efg
-          description: Form parameter enum test (string)
-          enum:
-          - _abc
-          - -efg
-          - (xyz)
-          type: string
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
+    testEnumParameters_enum_header_string_parameter:
+      default: -efg
+      enum:
+      - _abc
+      - -efg
+      - (xyz)
+      type: string
+    testEnumParameters_enum_query_integer_parameter:
+      enum:
+      - 1
+      - -2
+      format: int32
+      type: integer
+    testEnumParameters_enum_query_double_parameter:
+      enum:
+      - 1.1
+      - -1.2
+      format: double
+      type: number
     testEndpointParameters_request:
       properties:
         integer:
@@ -2427,6 +2386,54 @@ components:
       required:
       - ids
       type: object
+    Order_status:
+      description: Order Status
+      enum:
+      - placed
+      - approved
+      - delivered
+      type: string
+    Pet_status:
+      deprecated: true
+      description: pet status in the store
+      enum:
+      - available
+      - pending
+      - sold
+      type: string
+    Enum_Test_enum_string:
+      enum:
+      - UPPER
+      - lower
+      - ""
+      type: string
+    Enum_Test_enum_integer:
+      enum:
+      - 1
+      - -1
+      format: int32
+      type: integer
+    MapTest_map_of_enum_string_value:
+      enum:
+      - UPPER
+      - lower
+      type: string
+    EnumArrays_just_symbol:
+      enum:
+      - '>='
+      - $
+      type: string
+    EnumArrays_array_enum_inner:
+      enum:
+      - fish
+      - crab
+      type: string
+    zebra_type:
+      enum:
+      - plains
+      - mountain
+      - grevys
+      type: string
   securitySchemes:
     petstore_auth:
       flows:
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
index 6bd258ae1f7a..78bc19d25782 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
@@ -1641,60 +1641,59 @@ func (a *FakeAPIService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 type ApiTestEnumParametersRequest struct {
 	ctx context.Context
 	ApiService FakeAPI
-	enumHeaderStringArray *[]string
-	enumHeaderString *string
-	enumQueryStringArray *[]string
-	enumQueryString *string
-	enumQueryInteger *int32
-	enumQueryDouble *float64
-	enumFormStringArray *[]string
-	enumFormString *string
+	enumHeaderStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumHeaderString *TestEnumParametersEnumHeaderStringParameter
+	enumQueryStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumQueryString *TestEnumParametersEnumHeaderStringParameter
+	enumQueryInteger *TestEnumParametersEnumQueryIntegerParameter
+	enumQueryDouble *TestEnumParametersEnumQueryDoubleParameter
+	enumFormStringArray *[]TestEnumParametersRequestEnumFormStringArrayInner
+	enumFormString *TestEnumParametersRequestEnumFormString
 }
 
 // Header parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumHeaderStringArray(enumHeaderStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumHeaderStringArray = &enumHeaderStringArray
 	return r
 }
 
 // Header parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumHeaderString(enumHeaderString TestEnumParametersEnumHeaderStringParameter) ApiTestEnumParametersRequest {
 	r.enumHeaderString = &enumHeaderString
 	return r
 }
 
 // Query parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryStringArray(enumQueryStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumQueryStringArray = &enumQueryStringArray
 	return r
 }
 
 // Query parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryString(enumQueryString TestEnumParametersEnumHeaderStringParameter) ApiTestEnumParametersRequest {
 	r.enumQueryString = &enumQueryString
 	return r
 }
 
 // Query parameter enum test (double)
-func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger int32) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryInteger(enumQueryInteger TestEnumParametersEnumQueryIntegerParameter) ApiTestEnumParametersRequest {
 	r.enumQueryInteger = &enumQueryInteger
 	return r
 }
 
 // Query parameter enum test (double)
-func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble float64) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumQueryDouble(enumQueryDouble TestEnumParametersEnumQueryDoubleParameter) ApiTestEnumParametersRequest {
 	r.enumQueryDouble = &enumQueryDouble
 	return r
 }
 
 // Form parameter enum test (string array)
-func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumFormStringArray(enumFormStringArray []TestEnumParametersRequestEnumFormStringArrayInner) ApiTestEnumParametersRequest {
 	r.enumFormStringArray = &enumFormStringArray
 	return r
 }
 
-// Form parameter enum test (string)
-func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiTestEnumParametersRequest {
+func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString TestEnumParametersRequestEnumFormString) ApiTestEnumParametersRequest {
 	r.enumFormString = &enumFormString
 	return r
 }
@@ -1751,7 +1750,7 @@ func (a *FakeAPIService) TestEnumParametersExecute(r ApiTestEnumParametersReques
 	if r.enumQueryString != nil {
 		parameterAddToHeaderOrQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "form", "")
 	} else {
-		var defaultValue string = "-efg"
+		var defaultValue TestEnumParametersEnumHeaderStringParameter = "-efg"
 		r.enumQueryString = &defaultValue
 	}
 	if r.enumQueryInteger != nil {
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
index 86b91af49a3f..22e71036ae80 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
@@ -361,12 +361,12 @@ func (a *PetAPIService) DeletePetExecute(r ApiDeletePetRequest) (*http.Response,
 type ApiFindPetsByStatusRequest struct {
 	ctx context.Context
 	ApiService PetAPI
-	status *[]string
+	status *[]FindPetsByStatusStatusParameterInner
 }
 
 // Status values that need to be considered for filter
 // Deprecated
-func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusRequest {
+func (r ApiFindPetsByStatusRequest) Status(status []FindPetsByStatusStatusParameterInner) ApiFindPetsByStatusRequest {
 	r.status = &status
 	return r
 }
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArrays.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArrays.md
index 28011e23f568..c7281fa41ac1 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArrays.md
@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | Pointer to **string** |  | [optional] 
-**ArrayEnum** | Pointer to **[]string** |  | [optional] 
+**JustSymbol** | Pointer to [**EnumArraysJustSymbol**](EnumArraysJustSymbol.md) |  | [optional] 
+**ArrayEnum** | Pointer to [**[]EnumArraysArrayEnumInner**](EnumArraysArrayEnumInner.md) |  | [optional] 
 
 ## Methods
 
@@ -28,20 +28,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetJustSymbol
 
-`func (o *EnumArrays) GetJustSymbol() string`
+`func (o *EnumArrays) GetJustSymbol() EnumArraysJustSymbol`
 
 GetJustSymbol returns the JustSymbol field if non-nil, zero value otherwise.
 
 ### GetJustSymbolOk
 
-`func (o *EnumArrays) GetJustSymbolOk() (*string, bool)`
+`func (o *EnumArrays) GetJustSymbolOk() (*EnumArraysJustSymbol, bool)`
 
 GetJustSymbolOk returns a tuple with the JustSymbol field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetJustSymbol
 
-`func (o *EnumArrays) SetJustSymbol(v string)`
+`func (o *EnumArrays) SetJustSymbol(v EnumArraysJustSymbol)`
 
 SetJustSymbol sets JustSymbol field to given value.
 
@@ -53,20 +53,20 @@ HasJustSymbol returns a boolean if a field has been set.
 
 ### GetArrayEnum
 
-`func (o *EnumArrays) GetArrayEnum() []string`
+`func (o *EnumArrays) GetArrayEnum() []EnumArraysArrayEnumInner`
 
 GetArrayEnum returns the ArrayEnum field if non-nil, zero value otherwise.
 
 ### GetArrayEnumOk
 
-`func (o *EnumArrays) GetArrayEnumOk() (*[]string, bool)`
+`func (o *EnumArrays) GetArrayEnumOk() (*[]EnumArraysArrayEnumInner, bool)`
 
 GetArrayEnumOk returns a tuple with the ArrayEnum field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetArrayEnum
 
-`func (o *EnumArrays) SetArrayEnum(v []string)`
+`func (o *EnumArrays) SetArrayEnum(v []EnumArraysArrayEnumInner)`
 
 SetArrayEnum sets ArrayEnum field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md
new file mode 100644
index 000000000000..208b35975273
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArraysArrayEnumInner.md
@@ -0,0 +1,13 @@
+# EnumArraysArrayEnumInner
+
+## Enum
+
+
+* `FISH` (value: `"fish"`)
+
+* `CRAB` (value: `"crab"`)
+
+
+[[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/EnumArraysJustSymbol.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArraysJustSymbol.md
new file mode 100644
index 000000000000..18b0d62096a1
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumArraysJustSymbol.md
@@ -0,0 +1,13 @@
+# EnumArraysJustSymbol
+
+## Enum
+
+
+* `GREATER_THAN_OR_EQUAL_TO` (value: `">="`)
+
+* `DOLLAR` (value: `"$"`)
+
+
+[[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/EnumTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTest.md
index 75bf9867dac4..0a11d6d223ca 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTest.md
@@ -4,10 +4,10 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumString** | Pointer to **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**EnumInteger** | Pointer to **int32** |  | [optional] 
-**EnumNumber** | Pointer to **float64** |  | [optional] 
+**EnumString** | Pointer to [**EnumTestEnumString**](EnumTestEnumString.md) |  | [optional] 
+**EnumStringRequired** | [**EnumTestEnumString**](EnumTestEnumString.md) |  | 
+**EnumInteger** | Pointer to [**EnumTestEnumInteger**](EnumTestEnumInteger.md) |  | [optional] 
+**EnumNumber** | Pointer to [**TestEnumParametersEnumQueryDoubleParameter**](TestEnumParametersEnumQueryDoubleParameter.md) |  | [optional] 
 **OuterEnum** | Pointer to [**NullableOuterEnum**](OuterEnum.md) |  | [optional] 
 **OuterEnumInteger** | Pointer to [**OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] 
 **OuterEnumDefaultValue** | Pointer to [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] [default to OUTERENUMDEFAULTVALUE_PLACED]
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
 
 ### NewEnumTest
 
-`func NewEnumTest(enumStringRequired string, ) *EnumTest`
+`func NewEnumTest(enumStringRequired EnumTestEnumString, ) *EnumTest`
 
 NewEnumTest instantiates a new EnumTest object
 This constructor will assign default values to properties that have it defined,
@@ -34,20 +34,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetEnumString
 
-`func (o *EnumTest) GetEnumString() string`
+`func (o *EnumTest) GetEnumString() EnumTestEnumString`
 
 GetEnumString returns the EnumString field if non-nil, zero value otherwise.
 
 ### GetEnumStringOk
 
-`func (o *EnumTest) GetEnumStringOk() (*string, bool)`
+`func (o *EnumTest) GetEnumStringOk() (*EnumTestEnumString, bool)`
 
 GetEnumStringOk returns a tuple with the EnumString field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumString
 
-`func (o *EnumTest) SetEnumString(v string)`
+`func (o *EnumTest) SetEnumString(v EnumTestEnumString)`
 
 SetEnumString sets EnumString field to given value.
 
@@ -59,40 +59,40 @@ HasEnumString returns a boolean if a field has been set.
 
 ### GetEnumStringRequired
 
-`func (o *EnumTest) GetEnumStringRequired() string`
+`func (o *EnumTest) GetEnumStringRequired() EnumTestEnumString`
 
 GetEnumStringRequired returns the EnumStringRequired field if non-nil, zero value otherwise.
 
 ### GetEnumStringRequiredOk
 
-`func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool)`
+`func (o *EnumTest) GetEnumStringRequiredOk() (*EnumTestEnumString, bool)`
 
 GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumStringRequired
 
-`func (o *EnumTest) SetEnumStringRequired(v string)`
+`func (o *EnumTest) SetEnumStringRequired(v EnumTestEnumString)`
 
 SetEnumStringRequired sets EnumStringRequired field to given value.
 
 
 ### GetEnumInteger
 
-`func (o *EnumTest) GetEnumInteger() int32`
+`func (o *EnumTest) GetEnumInteger() EnumTestEnumInteger`
 
 GetEnumInteger returns the EnumInteger field if non-nil, zero value otherwise.
 
 ### GetEnumIntegerOk
 
-`func (o *EnumTest) GetEnumIntegerOk() (*int32, bool)`
+`func (o *EnumTest) GetEnumIntegerOk() (*EnumTestEnumInteger, bool)`
 
 GetEnumIntegerOk returns a tuple with the EnumInteger field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumInteger
 
-`func (o *EnumTest) SetEnumInteger(v int32)`
+`func (o *EnumTest) SetEnumInteger(v EnumTestEnumInteger)`
 
 SetEnumInteger sets EnumInteger field to given value.
 
@@ -104,20 +104,20 @@ HasEnumInteger returns a boolean if a field has been set.
 
 ### GetEnumNumber
 
-`func (o *EnumTest) GetEnumNumber() float64`
+`func (o *EnumTest) GetEnumNumber() TestEnumParametersEnumQueryDoubleParameter`
 
 GetEnumNumber returns the EnumNumber field if non-nil, zero value otherwise.
 
 ### GetEnumNumberOk
 
-`func (o *EnumTest) GetEnumNumberOk() (*float64, bool)`
+`func (o *EnumTest) GetEnumNumberOk() (*TestEnumParametersEnumQueryDoubleParameter, bool)`
 
 GetEnumNumberOk returns a tuple with the EnumNumber field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetEnumNumber
 
-`func (o *EnumTest) SetEnumNumber(v float64)`
+`func (o *EnumTest) SetEnumNumber(v TestEnumParametersEnumQueryDoubleParameter)`
 
 SetEnumNumber sets EnumNumber field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md
new file mode 100644
index 000000000000..a72b185f50a8
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTestEnumInteger.md
@@ -0,0 +1,13 @@
+# EnumTestEnumInteger
+
+## Enum
+
+
+* `_1` (value: `1`)
+
+* `_MINUS_1` (value: `-1`)
+
+
+[[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/EnumTestEnumString.md b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTestEnumString.md
new file mode 100644
index 000000000000..6f43802c998d
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/EnumTestEnumString.md
@@ -0,0 +1,15 @@
+# EnumTestEnumString
+
+## Enum
+
+
+* `UPPER` (value: `"UPPER"`)
+
+* `LOWER` (value: `"lower"`)
+
+* `EMPTY` (value: `""`)
+
+
+[[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/FakeAPI.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeAPI.md
index f533a395e2fa..6920bc6c32c4 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeAPI.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeAPI.md
@@ -789,14 +789,14 @@ import (
 )
 
 func main() {
-	enumHeaderStringArray := []string{"EnumHeaderStringArray_example"} // []string | Header parameter enum test (string array) (optional)
-	enumHeaderString := "enumHeaderString_example" // string | Header parameter enum test (string) (optional) (default to "-efg")
-	enumQueryStringArray := []string{"EnumQueryStringArray_example"} // []string | Query parameter enum test (string array) (optional)
-	enumQueryString := "enumQueryString_example" // string | Query parameter enum test (string) (optional) (default to "-efg")
-	enumQueryInteger := int32(56) // int32 | Query parameter enum test (double) (optional)
-	enumQueryDouble := float64(1.2) // float64 | Query parameter enum test (double) (optional)
-	enumFormStringArray := []string{"Inner_example"} // []string | Form parameter enum test (string array) (optional) (default to "$")
-	enumFormString := "enumFormString_example" // string | Form parameter enum test (string) (optional) (default to "-efg")
+	enumHeaderStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Header parameter enum test (string array) (optional)
+	enumHeaderString := openapiclient.testEnumParameters_enum_header_string_parameter("_abc") // TestEnumParametersEnumHeaderStringParameter | Header parameter enum test (string) (optional) (default to "-efg")
+	enumQueryStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Query parameter enum test (string array) (optional)
+	enumQueryString := openapiclient.testEnumParameters_enum_header_string_parameter("_abc") // TestEnumParametersEnumHeaderStringParameter | Query parameter enum test (string) (optional) (default to "-efg")
+	enumQueryInteger := openapiclient.testEnumParameters_enum_query_integer_parameter(1) // TestEnumParametersEnumQueryIntegerParameter | Query parameter enum test (double) (optional)
+	enumQueryDouble := openapiclient.testEnumParameters_enum_query_double_parameter(1.1) // TestEnumParametersEnumQueryDoubleParameter | Query parameter enum test (double) (optional)
+	enumFormStringArray := []openapiclient.TestEnumParametersRequestEnumFormStringArrayInner{openapiclient.testEnumParameters_request_enum_form_string_array_inner(">")} // []TestEnumParametersRequestEnumFormStringArrayInner | Form parameter enum test (string array) (optional) (default to "$")
+	enumFormString := openapiclient.testEnumParameters_request_enum_form_string("_abc") // TestEnumParametersRequestEnumFormString |  (optional) (default to "-efg")
 
 	configuration := openapiclient.NewConfiguration()
 	apiClient := openapiclient.NewAPIClient(configuration)
@@ -819,14 +819,14 @@ Other parameters are passed through a pointer to a apiTestEnumParametersRequest
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumHeaderStringArray** | **[]string** | Header parameter enum test (string array) | 
- **enumHeaderString** | **string** | Header parameter enum test (string) | [default to &quot;-efg&quot;]
- **enumQueryStringArray** | **[]string** | Query parameter enum test (string array) | 
- **enumQueryString** | **string** | Query parameter enum test (string) | [default to &quot;-efg&quot;]
- **enumQueryInteger** | **int32** | Query parameter enum test (double) | 
- **enumQueryDouble** | **float64** | Query parameter enum test (double) | 
- **enumFormStringArray** | **[]string** | Form parameter enum test (string array) | [default to &quot;$&quot;]
- **enumFormString** | **string** | Form parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumHeaderStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | 
+ **enumHeaderString** | [**TestEnumParametersEnumHeaderStringParameter**](TestEnumParametersEnumHeaderStringParameter.md) | Header parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumQueryStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | 
+ **enumQueryString** | [**TestEnumParametersEnumHeaderStringParameter**](TestEnumParametersEnumHeaderStringParameter.md) | Query parameter enum test (string) | [default to &quot;-efg&quot;]
+ **enumQueryInteger** | [**TestEnumParametersEnumQueryIntegerParameter**](TestEnumParametersEnumQueryIntegerParameter.md) | Query parameter enum test (double) | 
+ **enumQueryDouble** | [**TestEnumParametersEnumQueryDoubleParameter**](TestEnumParametersEnumQueryDoubleParameter.md) | Query parameter enum test (double) | 
+ **enumFormStringArray** | [**[]TestEnumParametersRequestEnumFormStringArrayInner**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [default to &quot;$&quot;]
+ **enumFormString** | [**TestEnumParametersRequestEnumFormString**](TestEnumParametersRequestEnumFormString.md) |  | [default to &quot;-efg&quot;]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md
new file mode 100644
index 000000000000..0efe505de3f9
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FindPetsByStatusStatusParameterInner.md
@@ -0,0 +1,15 @@
+# FindPetsByStatusStatusParameterInner
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/Mammal.md b/samples/openapi3/client/petstore/go/go-petstore/docs/Mammal.md
index 6e926911167b..77d1d6023a7a 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/Mammal.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **HasBaleen** | Pointer to **bool** |  | [optional] 
 **HasTeeth** | Pointer to **bool** |  | [optional] 
 **ClassName** | **string** |  | 
-**Type** | Pointer to **string** |  | [optional] 
+**Type** | Pointer to [**ZebraType**](ZebraType.md) |  | [optional] 
 
 ## Methods
 
@@ -100,20 +100,20 @@ SetClassName sets ClassName field to given value.
 
 ### GetType
 
-`func (o *Mammal) GetType() string`
+`func (o *Mammal) GetType() ZebraType`
 
 GetType returns the Type field if non-nil, zero value otherwise.
 
 ### GetTypeOk
 
-`func (o *Mammal) GetTypeOk() (*string, bool)`
+`func (o *Mammal) GetTypeOk() (*ZebraType, bool)`
 
 GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetType
 
-`func (o *Mammal) SetType(v string)`
+`func (o *Mammal) SetType(v ZebraType)`
 
 SetType sets Type field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/MapTest.md b/samples/openapi3/client/petstore/go/go-petstore/docs/MapTest.md
index d394cb5a9c18..00802d54069f 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | Pointer to **map[string]map[string]string** |  | [optional] 
-**MapOfEnumString** | Pointer to **map[string]string** |  | [optional] 
+**MapOfEnumString** | Pointer to [**map[string]MapTestMapOfEnumStringValue**](MapTestMapOfEnumStringValue.md) |  | [optional] 
 **DirectMap** | Pointer to **map[string]bool** |  | [optional] 
 **IndirectMap** | Pointer to **map[string]bool** |  | [optional] 
 
@@ -55,20 +55,20 @@ HasMapMapOfString returns a boolean if a field has been set.
 
 ### GetMapOfEnumString
 
-`func (o *MapTest) GetMapOfEnumString() map[string]string`
+`func (o *MapTest) GetMapOfEnumString() map[string]MapTestMapOfEnumStringValue`
 
 GetMapOfEnumString returns the MapOfEnumString field if non-nil, zero value otherwise.
 
 ### GetMapOfEnumStringOk
 
-`func (o *MapTest) GetMapOfEnumStringOk() (*map[string]string, bool)`
+`func (o *MapTest) GetMapOfEnumStringOk() (*map[string]MapTestMapOfEnumStringValue, bool)`
 
 GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetMapOfEnumString
 
-`func (o *MapTest) SetMapOfEnumString(v map[string]string)`
+`func (o *MapTest) SetMapOfEnumString(v map[string]MapTestMapOfEnumStringValue)`
 
 SetMapOfEnumString sets MapOfEnumString field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md b/samples/openapi3/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md
new file mode 100644
index 000000000000..67b6c07c23ad
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/MapTestMapOfEnumStringValue.md
@@ -0,0 +1,13 @@
+# MapTestMapOfEnumStringValue
+
+## Enum
+
+
+* `UPPER` (value: `"UPPER"`)
+
+* `LOWER` (value: `"lower"`)
+
+
+[[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/Order.md b/samples/openapi3/client/petstore/go/go-petstore/docs/Order.md
index 36aa2ef3ff15..cc343dddef32 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/Order.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/Order.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **PetId** | Pointer to **int64** |  | [optional] 
 **Quantity** | Pointer to **int32** |  | [optional] 
 **ShipDate** | Pointer to **time.Time** |  | [optional] 
-**Status** | Pointer to **string** | Order Status | [optional] 
+**Status** | Pointer to [**OrderStatus**](OrderStatus.md) |  | [optional] 
 **Complete** | Pointer to **bool** |  | [optional] [default to false]
 
 ## Methods
@@ -132,20 +132,20 @@ HasShipDate returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Order) GetStatus() string`
+`func (o *Order) GetStatus() OrderStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Order) GetStatusOk() (*string, bool)`
+`func (o *Order) GetStatusOk() (*OrderStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Order) SetStatus(v string)`
+`func (o *Order) SetStatus(v OrderStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/OrderStatus.md b/samples/openapi3/client/petstore/go/go-petstore/docs/OrderStatus.md
new file mode 100644
index 000000000000..45adb3be996c
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/OrderStatus.md
@@ -0,0 +1,15 @@
+# OrderStatus
+
+## Enum
+
+
+* `PLACED` (value: `"placed"`)
+
+* `APPROVED` (value: `"approved"`)
+
+* `SHIPPED` (value: `"delivered"`)
+
+
+[[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/Pet.md b/samples/openapi3/client/petstore/go/go-petstore/docs/Pet.md
index a6eae34657d3..9c5ceb9f2e34 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/Pet.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/Pet.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **Name** | **string** |  | 
 **PhotoUrls** | **[]string** |  | 
 **Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | Pointer to **string** | pet status in the store | [optional] 
+**Status** | Pointer to [**PetStatus**](PetStatus.md) |  | [optional] 
 
 ## Methods
 
@@ -147,20 +147,20 @@ HasTags returns a boolean if a field has been set.
 
 ### GetStatus
 
-`func (o *Pet) GetStatus() string`
+`func (o *Pet) GetStatus() PetStatus`
 
 GetStatus returns the Status field if non-nil, zero value otherwise.
 
 ### GetStatusOk
 
-`func (o *Pet) GetStatusOk() (*string, bool)`
+`func (o *Pet) GetStatusOk() (*PetStatus, bool)`
 
 GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetStatus
 
-`func (o *Pet) SetStatus(v string)`
+`func (o *Pet) SetStatus(v PetStatus)`
 
 SetStatus sets Status field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetAPI.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetAPI.md
index f034e1b6c6fd..4144a88f5768 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/PetAPI.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetAPI.md
@@ -171,7 +171,7 @@ import (
 )
 
 func main() {
-	status := []string{"Status_example"} // []string | Status values that need to be considered for filter
+	status := []openapiclient.FindPetsByStatusStatusParameterInner{openapiclient.findPetsByStatus_status_parameter_inner("available")} // []FindPetsByStatusStatusParameterInner | Status values that need to be considered for filter
 
 	configuration := openapiclient.NewConfiguration()
 	apiClient := openapiclient.NewAPIClient(configuration)
@@ -196,7 +196,7 @@ Other parameters are passed through a pointer to a apiFindPetsByStatusRequest st
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | **[]string** | Status values that need to be considered for filter | 
+ **status** | [**[]FindPetsByStatusStatusParameterInner**](FindPetsByStatusStatusParameterInner.md) | Status values that need to be considered for filter | 
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetStatus.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetStatus.md
new file mode 100644
index 000000000000..9b41cdb3b685
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetStatus.md
@@ -0,0 +1,15 @@
+# PetStatus
+
+## Enum
+
+
+* `AVAILABLE` (value: `"available"`)
+
+* `PENDING` (value: `"pending"`)
+
+* `SOLD` (value: `"sold"`)
+
+
+[[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/TestEnumParametersEnumHeaderStringParameter.md b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumHeaderStringParameter.md
new file mode 100644
index 000000000000..71416abd15a0
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumHeaderStringParameter.md
@@ -0,0 +1,15 @@
+# TestEnumParametersEnumHeaderStringParameter
+
+## Enum
+
+
+* `ABC` (value: `"_abc"`)
+
+* `EFG` (value: `"-efg"`)
+
+* `XYZ` (value: `"(xyz)"`)
+
+
+[[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/TestEnumParametersEnumQueryDoubleParameter.md b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryDoubleParameter.md
new file mode 100644
index 000000000000..fc31acb41971
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryDoubleParameter.md
@@ -0,0 +1,13 @@
+# TestEnumParametersEnumQueryDoubleParameter
+
+## Enum
+
+
+* `_1_DOT_1` (value: `1.1`)
+
+* `_MINUS_1_DOT_2` (value: `-1.2`)
+
+
+[[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/TestEnumParametersEnumQueryIntegerParameter.md b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryIntegerParameter.md
new file mode 100644
index 000000000000..524ba4325596
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersEnumQueryIntegerParameter.md
@@ -0,0 +1,13 @@
+# TestEnumParametersEnumQueryIntegerParameter
+
+## Enum
+
+
+* `_1` (value: `1`)
+
+* `_MINUS_2` (value: `-2`)
+
+
+[[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/TestEnumParametersRequestEnumFormString.md b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormString.md
new file mode 100644
index 000000000000..28709f9f40d6
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormString.md
@@ -0,0 +1,15 @@
+# TestEnumParametersRequestEnumFormString
+
+## Enum
+
+
+* `ABC` (value: `"_abc"`)
+
+* `EFG` (value: `"-efg"`)
+
+* `XYZ` (value: `"(xyz)"`)
+
+
+[[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/TestEnumParametersRequestEnumFormStringArrayInner.md b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormStringArrayInner.md
new file mode 100644
index 000000000000..a418977ee5f0
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/TestEnumParametersRequestEnumFormStringArrayInner.md
@@ -0,0 +1,13 @@
+# TestEnumParametersRequestEnumFormStringArrayInner
+
+## Enum
+
+
+* `GREATER_THAN` (value: `">"`)
+
+* `DOLLAR` (value: `"$"`)
+
+
+[[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/Zebra.md b/samples/openapi3/client/petstore/go/go-petstore/docs/Zebra.md
index 72f9fea8dbcc..4824f2ef5681 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/Zebra.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Type** | Pointer to **string** |  | [optional] 
+**Type** | Pointer to [**ZebraType**](ZebraType.md) |  | [optional] 
 **ClassName** | **string** |  | 
 
 ## Methods
@@ -28,20 +28,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetType
 
-`func (o *Zebra) GetType() string`
+`func (o *Zebra) GetType() ZebraType`
 
 GetType returns the Type field if non-nil, zero value otherwise.
 
 ### GetTypeOk
 
-`func (o *Zebra) GetTypeOk() (*string, bool)`
+`func (o *Zebra) GetTypeOk() (*ZebraType, bool)`
 
 GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetType
 
-`func (o *Zebra) SetType(v string)`
+`func (o *Zebra) SetType(v ZebraType)`
 
 SetType sets Type field to given value.
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/ZebraType.md b/samples/openapi3/client/petstore/go/go-petstore/docs/ZebraType.md
new file mode 100644
index 000000000000..f627af5efe59
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/ZebraType.md
@@ -0,0 +1,15 @@
+# ZebraType
+
+## Enum
+
+
+* `PLAINS` (value: `"plains"`)
+
+* `MOUNTAIN` (value: `"mountain"`)
+
+* `GREVYS` (value: `"grevys"`)
+
+
+[[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_enum_arrays.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go
index c6c519297f80..c8e32a457722 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays.go
@@ -19,8 +19,8 @@ var _ MappedNullable = &EnumArrays{}
 
 // EnumArrays struct for EnumArrays
 type EnumArrays struct {
-	JustSymbol *string `json:"just_symbol,omitempty"`
-	ArrayEnum []string `json:"array_enum,omitempty"`
+	JustSymbol *EnumArraysJustSymbol `json:"just_symbol,omitempty"`
+	ArrayEnum []EnumArraysArrayEnumInner `json:"array_enum,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
 
@@ -44,9 +44,9 @@ func NewEnumArraysWithDefaults() *EnumArrays {
 }
 
 // GetJustSymbol returns the JustSymbol field value if set, zero value otherwise.
-func (o *EnumArrays) GetJustSymbol() string {
+func (o *EnumArrays) GetJustSymbol() EnumArraysJustSymbol {
 	if o == nil || IsNil(o.JustSymbol) {
-		var ret string
+		var ret EnumArraysJustSymbol
 		return ret
 	}
 	return *o.JustSymbol
@@ -54,7 +54,7 @@ func (o *EnumArrays) GetJustSymbol() string {
 
 // GetJustSymbolOk returns a tuple with the JustSymbol field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumArrays) GetJustSymbolOk() (*string, bool) {
+func (o *EnumArrays) GetJustSymbolOk() (*EnumArraysJustSymbol, bool) {
 	if o == nil || IsNil(o.JustSymbol) {
 		return nil, false
 	}
@@ -70,15 +70,15 @@ func (o *EnumArrays) HasJustSymbol() bool {
 	return false
 }
 
-// SetJustSymbol gets a reference to the given string and assigns it to the JustSymbol field.
-func (o *EnumArrays) SetJustSymbol(v string) {
+// SetJustSymbol gets a reference to the given EnumArraysJustSymbol and assigns it to the JustSymbol field.
+func (o *EnumArrays) SetJustSymbol(v EnumArraysJustSymbol) {
 	o.JustSymbol = &v
 }
 
 // GetArrayEnum returns the ArrayEnum field value if set, zero value otherwise.
-func (o *EnumArrays) GetArrayEnum() []string {
+func (o *EnumArrays) GetArrayEnum() []EnumArraysArrayEnumInner {
 	if o == nil || IsNil(o.ArrayEnum) {
-		var ret []string
+		var ret []EnumArraysArrayEnumInner
 		return ret
 	}
 	return o.ArrayEnum
@@ -86,7 +86,7 @@ func (o *EnumArrays) GetArrayEnum() []string {
 
 // GetArrayEnumOk returns a tuple with the ArrayEnum field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumArrays) GetArrayEnumOk() ([]string, bool) {
+func (o *EnumArrays) GetArrayEnumOk() ([]EnumArraysArrayEnumInner, bool) {
 	if o == nil || IsNil(o.ArrayEnum) {
 		return nil, false
 	}
@@ -102,8 +102,8 @@ func (o *EnumArrays) HasArrayEnum() bool {
 	return false
 }
 
-// SetArrayEnum gets a reference to the given []string and assigns it to the ArrayEnum field.
-func (o *EnumArrays) SetArrayEnum(v []string) {
+// SetArrayEnum gets a reference to the given []EnumArraysArrayEnumInner and assigns it to the ArrayEnum field.
+func (o *EnumArrays) SetArrayEnum(v []EnumArraysArrayEnumInner) {
 	o.ArrayEnum = v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go
new file mode 100644
index 000000000000..c5e1c0acdf71
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_array_enum_inner.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumArraysArrayEnumInner the model 'EnumArraysArrayEnumInner'
+type EnumArraysArrayEnumInner string
+
+// List of EnumArrays_array_enum_inner
+const (
+	ENUMARRAYSARRAYENUMINNER_FISH EnumArraysArrayEnumInner = "fish"
+	ENUMARRAYSARRAYENUMINNER_CRAB EnumArraysArrayEnumInner = "crab"
+)
+
+// All allowed values of EnumArraysArrayEnumInner enum
+var AllowedEnumArraysArrayEnumInnerEnumValues = []EnumArraysArrayEnumInner{
+	"fish",
+	"crab",
+}
+
+func (v *EnumArraysArrayEnumInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumArraysArrayEnumInner(value)
+	for _, existing := range AllowedEnumArraysArrayEnumInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumArraysArrayEnumInner", value)
+}
+
+// NewEnumArraysArrayEnumInnerFromValue returns a pointer to a valid EnumArraysArrayEnumInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumArraysArrayEnumInnerFromValue(v string) (*EnumArraysArrayEnumInner, error) {
+	ev := EnumArraysArrayEnumInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumArraysArrayEnumInner: valid values are %v", v, AllowedEnumArraysArrayEnumInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumArraysArrayEnumInner) IsValid() bool {
+	for _, existing := range AllowedEnumArraysArrayEnumInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to EnumArrays_array_enum_inner value
+func (v EnumArraysArrayEnumInner) Ptr() *EnumArraysArrayEnumInner {
+	return &v
+}
+
+type NullableEnumArraysArrayEnumInner struct {
+	value *EnumArraysArrayEnumInner
+	isSet bool
+}
+
+func (v NullableEnumArraysArrayEnumInner) Get() *EnumArraysArrayEnumInner {
+	return v.value
+}
+
+func (v *NullableEnumArraysArrayEnumInner) Set(val *EnumArraysArrayEnumInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumArraysArrayEnumInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumArraysArrayEnumInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumArraysArrayEnumInner(val *EnumArraysArrayEnumInner) *NullableEnumArraysArrayEnumInner {
+	return &NullableEnumArraysArrayEnumInner{value: val, isSet: true}
+}
+
+func (v NullableEnumArraysArrayEnumInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumArraysArrayEnumInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go
new file mode 100644
index 000000000000..df7f4e4988da
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_arrays_just_symbol.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumArraysJustSymbol the model 'EnumArraysJustSymbol'
+type EnumArraysJustSymbol string
+
+// List of EnumArrays_just_symbol
+const (
+	ENUMARRAYSJUSTSYMBOL_GREATER_THAN_OR_EQUAL_TO EnumArraysJustSymbol = ">="
+	ENUMARRAYSJUSTSYMBOL_DOLLAR EnumArraysJustSymbol = "$"
+)
+
+// All allowed values of EnumArraysJustSymbol enum
+var AllowedEnumArraysJustSymbolEnumValues = []EnumArraysJustSymbol{
+	">=",
+	"$",
+}
+
+func (v *EnumArraysJustSymbol) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumArraysJustSymbol(value)
+	for _, existing := range AllowedEnumArraysJustSymbolEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumArraysJustSymbol", value)
+}
+
+// NewEnumArraysJustSymbolFromValue returns a pointer to a valid EnumArraysJustSymbol
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumArraysJustSymbolFromValue(v string) (*EnumArraysJustSymbol, error) {
+	ev := EnumArraysJustSymbol(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumArraysJustSymbol: valid values are %v", v, AllowedEnumArraysJustSymbolEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumArraysJustSymbol) IsValid() bool {
+	for _, existing := range AllowedEnumArraysJustSymbolEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to EnumArrays_just_symbol value
+func (v EnumArraysJustSymbol) Ptr() *EnumArraysJustSymbol {
+	return &v
+}
+
+type NullableEnumArraysJustSymbol struct {
+	value *EnumArraysJustSymbol
+	isSet bool
+}
+
+func (v NullableEnumArraysJustSymbol) Get() *EnumArraysJustSymbol {
+	return v.value
+}
+
+func (v *NullableEnumArraysJustSymbol) Set(val *EnumArraysJustSymbol) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumArraysJustSymbol) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumArraysJustSymbol) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumArraysJustSymbol(val *EnumArraysJustSymbol) *NullableEnumArraysJustSymbol {
+	return &NullableEnumArraysJustSymbol{value: val, isSet: true}
+}
+
+func (v NullableEnumArraysJustSymbol) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumArraysJustSymbol) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go
index ae19712f35a7..3cfe1cf4642a 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_.go
@@ -20,10 +20,10 @@ var _ MappedNullable = &EnumTest{}
 
 // EnumTest struct for EnumTest
 type EnumTest struct {
-	EnumString *string `json:"enum_string,omitempty"`
-	EnumStringRequired string `json:"enum_string_required"`
-	EnumInteger *int32 `json:"enum_integer,omitempty"`
-	EnumNumber *float64 `json:"enum_number,omitempty"`
+	EnumString *EnumTestEnumString `json:"enum_string,omitempty"`
+	EnumStringRequired EnumTestEnumString `json:"enum_string_required"`
+	EnumInteger *EnumTestEnumInteger `json:"enum_integer,omitempty"`
+	EnumNumber *TestEnumParametersEnumQueryDoubleParameter `json:"enum_number,omitempty"`
 	OuterEnum NullableOuterEnum `json:"outerEnum,omitempty"`
 	OuterEnumInteger *OuterEnumInteger `json:"outerEnumInteger,omitempty"`
 	OuterEnumDefaultValue *OuterEnumDefaultValue `json:"outerEnumDefaultValue,omitempty"`
@@ -37,7 +37,7 @@ type _EnumTest EnumTest
 // 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 NewEnumTest(enumStringRequired string) *EnumTest {
+func NewEnumTest(enumStringRequired EnumTestEnumString) *EnumTest {
 	this := EnumTest{}
 	this.EnumStringRequired = enumStringRequired
 	var outerEnumDefaultValue OuterEnumDefaultValue = OUTERENUMDEFAULTVALUE_PLACED
@@ -60,9 +60,9 @@ func NewEnumTestWithDefaults() *EnumTest {
 }
 
 // GetEnumString returns the EnumString field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumString() string {
+func (o *EnumTest) GetEnumString() EnumTestEnumString {
 	if o == nil || IsNil(o.EnumString) {
-		var ret string
+		var ret EnumTestEnumString
 		return ret
 	}
 	return *o.EnumString
@@ -70,7 +70,7 @@ func (o *EnumTest) GetEnumString() string {
 
 // GetEnumStringOk returns a tuple with the EnumString field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumStringOk() (*string, bool) {
+func (o *EnumTest) GetEnumStringOk() (*EnumTestEnumString, bool) {
 	if o == nil || IsNil(o.EnumString) {
 		return nil, false
 	}
@@ -86,15 +86,15 @@ func (o *EnumTest) HasEnumString() bool {
 	return false
 }
 
-// SetEnumString gets a reference to the given string and assigns it to the EnumString field.
-func (o *EnumTest) SetEnumString(v string) {
+// SetEnumString gets a reference to the given EnumTestEnumString and assigns it to the EnumString field.
+func (o *EnumTest) SetEnumString(v EnumTestEnumString) {
 	o.EnumString = &v
 }
 
 // GetEnumStringRequired returns the EnumStringRequired field value
-func (o *EnumTest) GetEnumStringRequired() string {
+func (o *EnumTest) GetEnumStringRequired() EnumTestEnumString {
 	if o == nil {
-		var ret string
+		var ret EnumTestEnumString
 		return ret
 	}
 
@@ -103,7 +103,7 @@ func (o *EnumTest) GetEnumStringRequired() string {
 
 // GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field value
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool) {
+func (o *EnumTest) GetEnumStringRequiredOk() (*EnumTestEnumString, bool) {
 	if o == nil {
 		return nil, false
 	}
@@ -111,15 +111,15 @@ func (o *EnumTest) GetEnumStringRequiredOk() (*string, bool) {
 }
 
 // SetEnumStringRequired sets field value
-func (o *EnumTest) SetEnumStringRequired(v string) {
+func (o *EnumTest) SetEnumStringRequired(v EnumTestEnumString) {
 	o.EnumStringRequired = v
 }
 
 
 // GetEnumInteger returns the EnumInteger field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumInteger() int32 {
+func (o *EnumTest) GetEnumInteger() EnumTestEnumInteger {
 	if o == nil || IsNil(o.EnumInteger) {
-		var ret int32
+		var ret EnumTestEnumInteger
 		return ret
 	}
 	return *o.EnumInteger
@@ -127,7 +127,7 @@ func (o *EnumTest) GetEnumInteger() int32 {
 
 // GetEnumIntegerOk returns a tuple with the EnumInteger field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumIntegerOk() (*int32, bool) {
+func (o *EnumTest) GetEnumIntegerOk() (*EnumTestEnumInteger, bool) {
 	if o == nil || IsNil(o.EnumInteger) {
 		return nil, false
 	}
@@ -143,15 +143,15 @@ func (o *EnumTest) HasEnumInteger() bool {
 	return false
 }
 
-// SetEnumInteger gets a reference to the given int32 and assigns it to the EnumInteger field.
-func (o *EnumTest) SetEnumInteger(v int32) {
+// SetEnumInteger gets a reference to the given EnumTestEnumInteger and assigns it to the EnumInteger field.
+func (o *EnumTest) SetEnumInteger(v EnumTestEnumInteger) {
 	o.EnumInteger = &v
 }
 
 // GetEnumNumber returns the EnumNumber field value if set, zero value otherwise.
-func (o *EnumTest) GetEnumNumber() float64 {
+func (o *EnumTest) GetEnumNumber() TestEnumParametersEnumQueryDoubleParameter {
 	if o == nil || IsNil(o.EnumNumber) {
-		var ret float64
+		var ret TestEnumParametersEnumQueryDoubleParameter
 		return ret
 	}
 	return *o.EnumNumber
@@ -159,7 +159,7 @@ func (o *EnumTest) GetEnumNumber() float64 {
 
 // GetEnumNumberOk returns a tuple with the EnumNumber field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnumTest) GetEnumNumberOk() (*float64, bool) {
+func (o *EnumTest) GetEnumNumberOk() (*TestEnumParametersEnumQueryDoubleParameter, bool) {
 	if o == nil || IsNil(o.EnumNumber) {
 		return nil, false
 	}
@@ -175,8 +175,8 @@ func (o *EnumTest) HasEnumNumber() bool {
 	return false
 }
 
-// SetEnumNumber gets a reference to the given float64 and assigns it to the EnumNumber field.
-func (o *EnumTest) SetEnumNumber(v float64) {
+// SetEnumNumber gets a reference to the given TestEnumParametersEnumQueryDoubleParameter and assigns it to the EnumNumber field.
+func (o *EnumTest) SetEnumNumber(v TestEnumParametersEnumQueryDoubleParameter) {
 	o.EnumNumber = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_integer.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_integer.go
new file mode 100644
index 000000000000..02e8d5d8101e
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_integer.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumTestEnumInteger the model 'EnumTestEnumInteger'
+type EnumTestEnumInteger int32
+
+// List of Enum_Test_enum_integer
+const (
+	ENUMTESTENUMINTEGER__1 EnumTestEnumInteger = 1
+	ENUMTESTENUMINTEGER__MINUS_1 EnumTestEnumInteger = -1
+)
+
+// All allowed values of EnumTestEnumInteger enum
+var AllowedEnumTestEnumIntegerEnumValues = []EnumTestEnumInteger{
+	1,
+	-1,
+}
+
+func (v *EnumTestEnumInteger) UnmarshalJSON(src []byte) error {
+	var value int32
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumTestEnumInteger(value)
+	for _, existing := range AllowedEnumTestEnumIntegerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumTestEnumInteger", value)
+}
+
+// NewEnumTestEnumIntegerFromValue returns a pointer to a valid EnumTestEnumInteger
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumTestEnumIntegerFromValue(v int32) (*EnumTestEnumInteger, error) {
+	ev := EnumTestEnumInteger(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumTestEnumInteger: valid values are %v", v, AllowedEnumTestEnumIntegerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumTestEnumInteger) IsValid() bool {
+	for _, existing := range AllowedEnumTestEnumIntegerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Enum_Test_enum_integer value
+func (v EnumTestEnumInteger) Ptr() *EnumTestEnumInteger {
+	return &v
+}
+
+type NullableEnumTestEnumInteger struct {
+	value *EnumTestEnumInteger
+	isSet bool
+}
+
+func (v NullableEnumTestEnumInteger) Get() *EnumTestEnumInteger {
+	return v.value
+}
+
+func (v *NullableEnumTestEnumInteger) Set(val *EnumTestEnumInteger) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumTestEnumInteger) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumTestEnumInteger) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumTestEnumInteger(val *EnumTestEnumInteger) *NullableEnumTestEnumInteger {
+	return &NullableEnumTestEnumInteger{value: val, isSet: true}
+}
+
+func (v NullableEnumTestEnumInteger) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumTestEnumInteger) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_string.go b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_string.go
new file mode 100644
index 000000000000..d557e122a16d
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_enum_test_enum_string.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// EnumTestEnumString the model 'EnumTestEnumString'
+type EnumTestEnumString string
+
+// List of Enum_Test_enum_string
+const (
+	ENUMTESTENUMSTRING_UPPER EnumTestEnumString = "UPPER"
+	ENUMTESTENUMSTRING_LOWER EnumTestEnumString = "lower"
+	ENUMTESTENUMSTRING_EMPTY EnumTestEnumString = ""
+)
+
+// All allowed values of EnumTestEnumString enum
+var AllowedEnumTestEnumStringEnumValues = []EnumTestEnumString{
+	"UPPER",
+	"lower",
+	"",
+}
+
+func (v *EnumTestEnumString) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := EnumTestEnumString(value)
+	for _, existing := range AllowedEnumTestEnumStringEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid EnumTestEnumString", value)
+}
+
+// NewEnumTestEnumStringFromValue returns a pointer to a valid EnumTestEnumString
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewEnumTestEnumStringFromValue(v string) (*EnumTestEnumString, error) {
+	ev := EnumTestEnumString(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for EnumTestEnumString: valid values are %v", v, AllowedEnumTestEnumStringEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v EnumTestEnumString) IsValid() bool {
+	for _, existing := range AllowedEnumTestEnumStringEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Enum_Test_enum_string value
+func (v EnumTestEnumString) Ptr() *EnumTestEnumString {
+	return &v
+}
+
+type NullableEnumTestEnumString struct {
+	value *EnumTestEnumString
+	isSet bool
+}
+
+func (v NullableEnumTestEnumString) Get() *EnumTestEnumString {
+	return v.value
+}
+
+func (v *NullableEnumTestEnumString) Set(val *EnumTestEnumString) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableEnumTestEnumString) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableEnumTestEnumString) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableEnumTestEnumString(val *EnumTestEnumString) *NullableEnumTestEnumString {
+	return &NullableEnumTestEnumString{value: val, isSet: true}
+}
+
+func (v NullableEnumTestEnumString) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableEnumTestEnumString) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go b/samples/openapi3/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go
new file mode 100644
index 000000000000..e61b3c638e8e
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_find_pets_by_status_status_parameter_inner.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// FindPetsByStatusStatusParameterInner the model 'FindPetsByStatusStatusParameterInner'
+type FindPetsByStatusStatusParameterInner string
+
+// List of findPetsByStatus_status_parameter_inner
+const (
+	FINDPETSBYSTATUSSTATUSPARAMETERINNER_AVAILABLE FindPetsByStatusStatusParameterInner = "available"
+	FINDPETSBYSTATUSSTATUSPARAMETERINNER_PENDING FindPetsByStatusStatusParameterInner = "pending"
+	FINDPETSBYSTATUSSTATUSPARAMETERINNER_SOLD FindPetsByStatusStatusParameterInner = "sold"
+)
+
+// All allowed values of FindPetsByStatusStatusParameterInner enum
+var AllowedFindPetsByStatusStatusParameterInnerEnumValues = []FindPetsByStatusStatusParameterInner{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *FindPetsByStatusStatusParameterInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := FindPetsByStatusStatusParameterInner(value)
+	for _, existing := range AllowedFindPetsByStatusStatusParameterInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid FindPetsByStatusStatusParameterInner", value)
+}
+
+// NewFindPetsByStatusStatusParameterInnerFromValue returns a pointer to a valid FindPetsByStatusStatusParameterInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewFindPetsByStatusStatusParameterInnerFromValue(v string) (*FindPetsByStatusStatusParameterInner, error) {
+	ev := FindPetsByStatusStatusParameterInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for FindPetsByStatusStatusParameterInner: valid values are %v", v, AllowedFindPetsByStatusStatusParameterInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v FindPetsByStatusStatusParameterInner) IsValid() bool {
+	for _, existing := range AllowedFindPetsByStatusStatusParameterInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to findPetsByStatus_status_parameter_inner value
+func (v FindPetsByStatusStatusParameterInner) Ptr() *FindPetsByStatusStatusParameterInner {
+	return &v
+}
+
+type NullableFindPetsByStatusStatusParameterInner struct {
+	value *FindPetsByStatusStatusParameterInner
+	isSet bool
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) Get() *FindPetsByStatusStatusParameterInner {
+	return v.value
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) Set(val *FindPetsByStatusStatusParameterInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableFindPetsByStatusStatusParameterInner(val *FindPetsByStatusStatusParameterInner) *NullableFindPetsByStatusStatusParameterInner {
+	return &NullableFindPetsByStatusStatusParameterInner{value: val, isSet: true}
+}
+
+func (v NullableFindPetsByStatusStatusParameterInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableFindPetsByStatusStatusParameterInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go
index 6282f65b6cf3..f6a9d63bfecc 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_.go
@@ -20,7 +20,7 @@ var _ MappedNullable = &MapTest{}
 // MapTest struct for MapTest
 type MapTest struct {
 	MapMapOfString *map[string]map[string]string `json:"map_map_of_string,omitempty"`
-	MapOfEnumString *map[string]string `json:"map_of_enum_string,omitempty"`
+	MapOfEnumString *map[string]MapTestMapOfEnumStringValue `json:"map_of_enum_string,omitempty"`
 	DirectMap *map[string]bool `json:"direct_map,omitempty"`
 	IndirectMap *map[string]bool `json:"indirect_map,omitempty"`
 	AdditionalProperties map[string]interface{}
@@ -78,9 +78,9 @@ func (o *MapTest) SetMapMapOfString(v map[string]map[string]string) {
 }
 
 // GetMapOfEnumString returns the MapOfEnumString field value if set, zero value otherwise.
-func (o *MapTest) GetMapOfEnumString() map[string]string {
+func (o *MapTest) GetMapOfEnumString() map[string]MapTestMapOfEnumStringValue {
 	if o == nil || IsNil(o.MapOfEnumString) {
-		var ret map[string]string
+		var ret map[string]MapTestMapOfEnumStringValue
 		return ret
 	}
 	return *o.MapOfEnumString
@@ -88,7 +88,7 @@ func (o *MapTest) GetMapOfEnumString() map[string]string {
 
 // GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MapTest) GetMapOfEnumStringOk() (*map[string]string, bool) {
+func (o *MapTest) GetMapOfEnumStringOk() (*map[string]MapTestMapOfEnumStringValue, bool) {
 	if o == nil || IsNil(o.MapOfEnumString) {
 		return nil, false
 	}
@@ -104,8 +104,8 @@ func (o *MapTest) HasMapOfEnumString() bool {
 	return false
 }
 
-// SetMapOfEnumString gets a reference to the given map[string]string and assigns it to the MapOfEnumString field.
-func (o *MapTest) SetMapOfEnumString(v map[string]string) {
+// SetMapOfEnumString gets a reference to the given map[string]MapTestMapOfEnumStringValue and assigns it to the MapOfEnumString field.
+func (o *MapTest) SetMapOfEnumString(v map[string]MapTestMapOfEnumStringValue) {
 	o.MapOfEnumString = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go
new file mode 100644
index 000000000000..d8b0ed528039
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_map_test_map_of_enum_string_value.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// MapTestMapOfEnumStringValue the model 'MapTestMapOfEnumStringValue'
+type MapTestMapOfEnumStringValue string
+
+// List of MapTest_map_of_enum_string_value
+const (
+	MAPTESTMAPOFENUMSTRINGVALUE_UPPER MapTestMapOfEnumStringValue = "UPPER"
+	MAPTESTMAPOFENUMSTRINGVALUE_LOWER MapTestMapOfEnumStringValue = "lower"
+)
+
+// All allowed values of MapTestMapOfEnumStringValue enum
+var AllowedMapTestMapOfEnumStringValueEnumValues = []MapTestMapOfEnumStringValue{
+	"UPPER",
+	"lower",
+}
+
+func (v *MapTestMapOfEnumStringValue) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := MapTestMapOfEnumStringValue(value)
+	for _, existing := range AllowedMapTestMapOfEnumStringValueEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid MapTestMapOfEnumStringValue", value)
+}
+
+// NewMapTestMapOfEnumStringValueFromValue returns a pointer to a valid MapTestMapOfEnumStringValue
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewMapTestMapOfEnumStringValueFromValue(v string) (*MapTestMapOfEnumStringValue, error) {
+	ev := MapTestMapOfEnumStringValue(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for MapTestMapOfEnumStringValue: valid values are %v", v, AllowedMapTestMapOfEnumStringValueEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v MapTestMapOfEnumStringValue) IsValid() bool {
+	for _, existing := range AllowedMapTestMapOfEnumStringValueEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to MapTest_map_of_enum_string_value value
+func (v MapTestMapOfEnumStringValue) Ptr() *MapTestMapOfEnumStringValue {
+	return &v
+}
+
+type NullableMapTestMapOfEnumStringValue struct {
+	value *MapTestMapOfEnumStringValue
+	isSet bool
+}
+
+func (v NullableMapTestMapOfEnumStringValue) Get() *MapTestMapOfEnumStringValue {
+	return v.value
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) Set(val *MapTestMapOfEnumStringValue) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableMapTestMapOfEnumStringValue) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableMapTestMapOfEnumStringValue(val *MapTestMapOfEnumStringValue) *NullableMapTestMapOfEnumStringValue {
+	return &NullableMapTestMapOfEnumStringValue{value: val, isSet: true}
+}
+
+func (v NullableMapTestMapOfEnumStringValue) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableMapTestMapOfEnumStringValue) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_order.go b/samples/openapi3/client/petstore/go/go-petstore/model_order.go
index 8606747f525b..7ca6cfbcccd9 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_order.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_order.go
@@ -24,8 +24,7 @@ type Order struct {
 	PetId *int64 `json:"petId,omitempty"`
 	Quantity *int32 `json:"quantity,omitempty"`
 	ShipDate *time.Time `json:"shipDate,omitempty"`
-	// Order Status
-	Status *string `json:"status,omitempty"`
+	Status *OrderStatus `json:"status,omitempty"`
 	Complete *bool `json:"complete,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
@@ -182,9 +181,9 @@ func (o *Order) SetShipDate(v time.Time) {
 }
 
 // GetStatus returns the Status field value if set, zero value otherwise.
-func (o *Order) GetStatus() string {
+func (o *Order) GetStatus() OrderStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret OrderStatus
 		return ret
 	}
 	return *o.Status
@@ -192,7 +191,7 @@ func (o *Order) GetStatus() string {
 
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Order) GetStatusOk() (*string, bool) {
+func (o *Order) GetStatusOk() (*OrderStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -208,8 +207,8 @@ func (o *Order) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
-func (o *Order) SetStatus(v string) {
+// SetStatus gets a reference to the given OrderStatus and assigns it to the Status field.
+func (o *Order) SetStatus(v OrderStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_order_status.go b/samples/openapi3/client/petstore/go/go-petstore/model_order_status.go
new file mode 100644
index 000000000000..5e4966b764f7
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_order_status.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// OrderStatus Order Status
+type OrderStatus string
+
+// List of Order_status
+const (
+	ORDERSTATUS_PLACED OrderStatus = "placed"
+	ORDERSTATUS_APPROVED OrderStatus = "approved"
+	ORDERSTATUS_SHIPPED OrderStatus = "delivered"
+)
+
+// All allowed values of OrderStatus enum
+var AllowedOrderStatusEnumValues = []OrderStatus{
+	"placed",
+	"approved",
+	"delivered",
+}
+
+func (v *OrderStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := OrderStatus(value)
+	for _, existing := range AllowedOrderStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid OrderStatus", value)
+}
+
+// NewOrderStatusFromValue returns a pointer to a valid OrderStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewOrderStatusFromValue(v string) (*OrderStatus, error) {
+	ev := OrderStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for OrderStatus: valid values are %v", v, AllowedOrderStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v OrderStatus) IsValid() bool {
+	for _, existing := range AllowedOrderStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Order_status value
+func (v OrderStatus) Ptr() *OrderStatus {
+	return &v
+}
+
+type NullableOrderStatus struct {
+	value *OrderStatus
+	isSet bool
+}
+
+func (v NullableOrderStatus) Get() *OrderStatus {
+	return v.value
+}
+
+func (v *NullableOrderStatus) Set(val *OrderStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableOrderStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableOrderStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableOrderStatus(val *OrderStatus) *NullableOrderStatus {
+	return &NullableOrderStatus{value: val, isSet: true}
+}
+
+func (v NullableOrderStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableOrderStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_pet.go b/samples/openapi3/client/petstore/go/go-petstore/model_pet.go
index 364d9bc53dd4..b64147f13a43 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_pet.go
@@ -25,9 +25,8 @@ type Pet struct {
 	Name string `json:"name"`
 	PhotoUrls []string `json:"photoUrls"`
 	Tags []Tag `json:"tags,omitempty"`
-	// pet status in the store
 	// Deprecated
-	Status *string `json:"status,omitempty"`
+	Status *PetStatus `json:"status,omitempty"`
 	AdditionalProperties map[string]interface{}
 }
 
@@ -200,9 +199,9 @@ func (o *Pet) SetTags(v []Tag) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 // Deprecated
-func (o *Pet) GetStatus() string {
+func (o *Pet) GetStatus() PetStatus {
 	if o == nil || IsNil(o.Status) {
-		var ret string
+		var ret PetStatus
 		return ret
 	}
 	return *o.Status
@@ -211,7 +210,7 @@ func (o *Pet) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 // Deprecated
-func (o *Pet) GetStatusOk() (*string, bool) {
+func (o *Pet) GetStatusOk() (*PetStatus, bool) {
 	if o == nil || IsNil(o.Status) {
 		return nil, false
 	}
@@ -227,9 +226,9 @@ func (o *Pet) HasStatus() bool {
 	return false
 }
 
-// SetStatus gets a reference to the given string and assigns it to the Status field.
+// SetStatus gets a reference to the given PetStatus and assigns it to the Status field.
 // Deprecated
-func (o *Pet) SetStatus(v string) {
+func (o *Pet) SetStatus(v PetStatus) {
 	o.Status = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_pet_status.go b/samples/openapi3/client/petstore/go/go-petstore/model_pet_status.go
new file mode 100644
index 000000000000..0e0197074057
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_pet_status.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// PetStatus pet status in the store
+type PetStatus string
+
+// List of Pet_status
+const (
+	PETSTATUS_AVAILABLE PetStatus = "available"
+	PETSTATUS_PENDING PetStatus = "pending"
+	PETSTATUS_SOLD PetStatus = "sold"
+)
+
+// All allowed values of PetStatus enum
+var AllowedPetStatusEnumValues = []PetStatus{
+	"available",
+	"pending",
+	"sold",
+}
+
+func (v *PetStatus) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := PetStatus(value)
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid PetStatus", value)
+}
+
+// NewPetStatusFromValue returns a pointer to a valid PetStatus
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewPetStatusFromValue(v string) (*PetStatus, error) {
+	ev := PetStatus(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for PetStatus: valid values are %v", v, AllowedPetStatusEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v PetStatus) IsValid() bool {
+	for _, existing := range AllowedPetStatusEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to Pet_status value
+func (v PetStatus) Ptr() *PetStatus {
+	return &v
+}
+
+type NullablePetStatus struct {
+	value *PetStatus
+	isSet bool
+}
+
+func (v NullablePetStatus) Get() *PetStatus {
+	return v.value
+}
+
+func (v *NullablePetStatus) Set(val *PetStatus) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullablePetStatus) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullablePetStatus) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullablePetStatus(val *PetStatus) *NullablePetStatus {
+	return &NullablePetStatus{value: val, isSet: true}
+}
+
+func (v NullablePetStatus) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullablePetStatus) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go
new file mode 100644
index 000000000000..0620acd6b265
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_header_string_parameter.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumHeaderStringParameter the model 'TestEnumParametersEnumHeaderStringParameter'
+type TestEnumParametersEnumHeaderStringParameter string
+
+// List of testEnumParameters_enum_header_string_parameter
+const (
+	TESTENUMPARAMETERSENUMHEADERSTRINGPARAMETER_ABC TestEnumParametersEnumHeaderStringParameter = "_abc"
+	TESTENUMPARAMETERSENUMHEADERSTRINGPARAMETER_EFG TestEnumParametersEnumHeaderStringParameter = "-efg"
+	TESTENUMPARAMETERSENUMHEADERSTRINGPARAMETER_XYZ TestEnumParametersEnumHeaderStringParameter = "(xyz)"
+)
+
+// All allowed values of TestEnumParametersEnumHeaderStringParameter enum
+var AllowedTestEnumParametersEnumHeaderStringParameterEnumValues = []TestEnumParametersEnumHeaderStringParameter{
+	"_abc",
+	"-efg",
+	"(xyz)",
+}
+
+func (v *TestEnumParametersEnumHeaderStringParameter) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumHeaderStringParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumHeaderStringParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumHeaderStringParameter", value)
+}
+
+// NewTestEnumParametersEnumHeaderStringParameterFromValue returns a pointer to a valid TestEnumParametersEnumHeaderStringParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumHeaderStringParameterFromValue(v string) (*TestEnumParametersEnumHeaderStringParameter, error) {
+	ev := TestEnumParametersEnumHeaderStringParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumHeaderStringParameter: valid values are %v", v, AllowedTestEnumParametersEnumHeaderStringParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumHeaderStringParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumHeaderStringParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_header_string_parameter value
+func (v TestEnumParametersEnumHeaderStringParameter) Ptr() *TestEnumParametersEnumHeaderStringParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumHeaderStringParameter struct {
+	value *TestEnumParametersEnumHeaderStringParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) Get() *TestEnumParametersEnumHeaderStringParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) Set(val *TestEnumParametersEnumHeaderStringParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumHeaderStringParameter(val *TestEnumParametersEnumHeaderStringParameter) *NullableTestEnumParametersEnumHeaderStringParameter {
+	return &NullableTestEnumParametersEnumHeaderStringParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumHeaderStringParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumHeaderStringParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go
new file mode 100644
index 000000000000..bc31185aa759
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_double_parameter.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumQueryDoubleParameter the model 'TestEnumParametersEnumQueryDoubleParameter'
+type TestEnumParametersEnumQueryDoubleParameter double
+
+// List of testEnumParameters_enum_query_double_parameter
+const (
+	TESTENUMPARAMETERSENUMQUERYDOUBLEPARAMETER__1_DOT_1 TestEnumParametersEnumQueryDoubleParameter = 1.1
+	TESTENUMPARAMETERSENUMQUERYDOUBLEPARAMETER__MINUS_1_DOT_2 TestEnumParametersEnumQueryDoubleParameter = -1.2
+)
+
+// All allowed values of TestEnumParametersEnumQueryDoubleParameter enum
+var AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues = []TestEnumParametersEnumQueryDoubleParameter{
+	1.1,
+	-1.2,
+}
+
+func (v *TestEnumParametersEnumQueryDoubleParameter) UnmarshalJSON(src []byte) error {
+	var value double
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumQueryDoubleParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumQueryDoubleParameter", value)
+}
+
+// NewTestEnumParametersEnumQueryDoubleParameterFromValue returns a pointer to a valid TestEnumParametersEnumQueryDoubleParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumQueryDoubleParameterFromValue(v double) (*TestEnumParametersEnumQueryDoubleParameter, error) {
+	ev := TestEnumParametersEnumQueryDoubleParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumQueryDoubleParameter: valid values are %v", v, AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumQueryDoubleParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumQueryDoubleParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_query_double_parameter value
+func (v TestEnumParametersEnumQueryDoubleParameter) Ptr() *TestEnumParametersEnumQueryDoubleParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumQueryDoubleParameter struct {
+	value *TestEnumParametersEnumQueryDoubleParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) Get() *TestEnumParametersEnumQueryDoubleParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) Set(val *TestEnumParametersEnumQueryDoubleParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumQueryDoubleParameter(val *TestEnumParametersEnumQueryDoubleParameter) *NullableTestEnumParametersEnumQueryDoubleParameter {
+	return &NullableTestEnumParametersEnumQueryDoubleParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumQueryDoubleParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumQueryDoubleParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go
new file mode 100644
index 000000000000..38fa53171c2f
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_enum_query_integer_parameter.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersEnumQueryIntegerParameter the model 'TestEnumParametersEnumQueryIntegerParameter'
+type TestEnumParametersEnumQueryIntegerParameter int32
+
+// List of testEnumParameters_enum_query_integer_parameter
+const (
+	TESTENUMPARAMETERSENUMQUERYINTEGERPARAMETER__1 TestEnumParametersEnumQueryIntegerParameter = 1
+	TESTENUMPARAMETERSENUMQUERYINTEGERPARAMETER__MINUS_2 TestEnumParametersEnumQueryIntegerParameter = -2
+)
+
+// All allowed values of TestEnumParametersEnumQueryIntegerParameter enum
+var AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues = []TestEnumParametersEnumQueryIntegerParameter{
+	1,
+	-2,
+}
+
+func (v *TestEnumParametersEnumQueryIntegerParameter) UnmarshalJSON(src []byte) error {
+	var value int32
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersEnumQueryIntegerParameter(value)
+	for _, existing := range AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersEnumQueryIntegerParameter", value)
+}
+
+// NewTestEnumParametersEnumQueryIntegerParameterFromValue returns a pointer to a valid TestEnumParametersEnumQueryIntegerParameter
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersEnumQueryIntegerParameterFromValue(v int32) (*TestEnumParametersEnumQueryIntegerParameter, error) {
+	ev := TestEnumParametersEnumQueryIntegerParameter(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersEnumQueryIntegerParameter: valid values are %v", v, AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersEnumQueryIntegerParameter) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersEnumQueryIntegerParameterEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_enum_query_integer_parameter value
+func (v TestEnumParametersEnumQueryIntegerParameter) Ptr() *TestEnumParametersEnumQueryIntegerParameter {
+	return &v
+}
+
+type NullableTestEnumParametersEnumQueryIntegerParameter struct {
+	value *TestEnumParametersEnumQueryIntegerParameter
+	isSet bool
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) Get() *TestEnumParametersEnumQueryIntegerParameter {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) Set(val *TestEnumParametersEnumQueryIntegerParameter) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersEnumQueryIntegerParameter(val *TestEnumParametersEnumQueryIntegerParameter) *NullableTestEnumParametersEnumQueryIntegerParameter {
+	return &NullableTestEnumParametersEnumQueryIntegerParameter{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersEnumQueryIntegerParameter) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersEnumQueryIntegerParameter) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go
new file mode 100644
index 000000000000..4a5b7bbb7db2
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersRequestEnumFormString Form parameter enum test (string)
+type TestEnumParametersRequestEnumFormString string
+
+// List of testEnumParameters_request_enum_form_string
+const (
+	TESTENUMPARAMETERSREQUESTENUMFORMSTRING_ABC TestEnumParametersRequestEnumFormString = "_abc"
+	TESTENUMPARAMETERSREQUESTENUMFORMSTRING_EFG TestEnumParametersRequestEnumFormString = "-efg"
+	TESTENUMPARAMETERSREQUESTENUMFORMSTRING_XYZ TestEnumParametersRequestEnumFormString = "(xyz)"
+)
+
+// All allowed values of TestEnumParametersRequestEnumFormString enum
+var AllowedTestEnumParametersRequestEnumFormStringEnumValues = []TestEnumParametersRequestEnumFormString{
+	"_abc",
+	"-efg",
+	"(xyz)",
+}
+
+func (v *TestEnumParametersRequestEnumFormString) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersRequestEnumFormString(value)
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersRequestEnumFormString", value)
+}
+
+// NewTestEnumParametersRequestEnumFormStringFromValue returns a pointer to a valid TestEnumParametersRequestEnumFormString
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersRequestEnumFormStringFromValue(v string) (*TestEnumParametersRequestEnumFormString, error) {
+	ev := TestEnumParametersRequestEnumFormString(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersRequestEnumFormString: valid values are %v", v, AllowedTestEnumParametersRequestEnumFormStringEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersRequestEnumFormString) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_request_enum_form_string value
+func (v TestEnumParametersRequestEnumFormString) Ptr() *TestEnumParametersRequestEnumFormString {
+	return &v
+}
+
+type NullableTestEnumParametersRequestEnumFormString struct {
+	value *TestEnumParametersRequestEnumFormString
+	isSet bool
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) Get() *TestEnumParametersRequestEnumFormString {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) Set(val *TestEnumParametersRequestEnumFormString) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersRequestEnumFormString(val *TestEnumParametersRequestEnumFormString) *NullableTestEnumParametersRequestEnumFormString {
+	return &NullableTestEnumParametersRequestEnumFormString{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersRequestEnumFormString) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormString) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go
new file mode 100644
index 000000000000..59b623ac8f06
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_test_enum_parameters_request_enum_form_string_array_inner.go
@@ -0,0 +1,111 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// TestEnumParametersRequestEnumFormStringArrayInner the model 'TestEnumParametersRequestEnumFormStringArrayInner'
+type TestEnumParametersRequestEnumFormStringArrayInner string
+
+// List of testEnumParameters_request_enum_form_string_array_inner
+const (
+	TESTENUMPARAMETERSREQUESTENUMFORMSTRINGARRAYINNER_GREATER_THAN TestEnumParametersRequestEnumFormStringArrayInner = ">"
+	TESTENUMPARAMETERSREQUESTENUMFORMSTRINGARRAYINNER_DOLLAR TestEnumParametersRequestEnumFormStringArrayInner = "$"
+)
+
+// All allowed values of TestEnumParametersRequestEnumFormStringArrayInner enum
+var AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues = []TestEnumParametersRequestEnumFormStringArrayInner{
+	">",
+	"$",
+}
+
+func (v *TestEnumParametersRequestEnumFormStringArrayInner) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := TestEnumParametersRequestEnumFormStringArrayInner(value)
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid TestEnumParametersRequestEnumFormStringArrayInner", value)
+}
+
+// NewTestEnumParametersRequestEnumFormStringArrayInnerFromValue returns a pointer to a valid TestEnumParametersRequestEnumFormStringArrayInner
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewTestEnumParametersRequestEnumFormStringArrayInnerFromValue(v string) (*TestEnumParametersRequestEnumFormStringArrayInner, error) {
+	ev := TestEnumParametersRequestEnumFormStringArrayInner(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for TestEnumParametersRequestEnumFormStringArrayInner: valid values are %v", v, AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v TestEnumParametersRequestEnumFormStringArrayInner) IsValid() bool {
+	for _, existing := range AllowedTestEnumParametersRequestEnumFormStringArrayInnerEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to testEnumParameters_request_enum_form_string_array_inner value
+func (v TestEnumParametersRequestEnumFormStringArrayInner) Ptr() *TestEnumParametersRequestEnumFormStringArrayInner {
+	return &v
+}
+
+type NullableTestEnumParametersRequestEnumFormStringArrayInner struct {
+	value *TestEnumParametersRequestEnumFormStringArrayInner
+	isSet bool
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) Get() *TestEnumParametersRequestEnumFormStringArrayInner {
+	return v.value
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) Set(val *TestEnumParametersRequestEnumFormStringArrayInner) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableTestEnumParametersRequestEnumFormStringArrayInner(val *TestEnumParametersRequestEnumFormStringArrayInner) *NullableTestEnumParametersRequestEnumFormStringArrayInner {
+	return &NullableTestEnumParametersRequestEnumFormStringArrayInner{value: val, isSet: true}
+}
+
+func (v NullableTestEnumParametersRequestEnumFormStringArrayInner) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableTestEnumParametersRequestEnumFormStringArrayInner) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go b/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go
index 9b04e675f17b..8e13515d89fd 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_zebra.go
@@ -20,7 +20,7 @@ var _ MappedNullable = &Zebra{}
 
 // Zebra struct for Zebra
 type Zebra struct {
-	Type *string `json:"type,omitempty"`
+	Type *ZebraType `json:"type,omitempty"`
 	ClassName string `json:"className"`
 	AdditionalProperties map[string]interface{}
 }
@@ -46,9 +46,9 @@ func NewZebraWithDefaults() *Zebra {
 }
 
 // GetType returns the Type field value if set, zero value otherwise.
-func (o *Zebra) GetType() string {
+func (o *Zebra) GetType() ZebraType {
 	if o == nil || IsNil(o.Type) {
-		var ret string
+		var ret ZebraType
 		return ret
 	}
 	return *o.Type
@@ -56,7 +56,7 @@ func (o *Zebra) GetType() string {
 
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Zebra) GetTypeOk() (*string, bool) {
+func (o *Zebra) GetTypeOk() (*ZebraType, bool) {
 	if o == nil || IsNil(o.Type) {
 		return nil, false
 	}
@@ -72,8 +72,8 @@ func (o *Zebra) HasType() bool {
 	return false
 }
 
-// SetType gets a reference to the given string and assigns it to the Type field.
-func (o *Zebra) SetType(v string) {
+// SetType gets a reference to the given ZebraType and assigns it to the Type field.
+func (o *Zebra) SetType(v ZebraType) {
 	o.Type = &v
 }
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_zebra_type.go b/samples/openapi3/client/petstore/go/go-petstore/model_zebra_type.go
new file mode 100644
index 000000000000..da6dd381fb13
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_zebra_type.go
@@ -0,0 +1,113 @@
+/*
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+API version: 1.0.0
+*/
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// ZebraType the model 'ZebraType'
+type ZebraType string
+
+// List of zebra_type
+const (
+	ZEBRATYPE_PLAINS ZebraType = "plains"
+	ZEBRATYPE_MOUNTAIN ZebraType = "mountain"
+	ZEBRATYPE_GREVYS ZebraType = "grevys"
+)
+
+// All allowed values of ZebraType enum
+var AllowedZebraTypeEnumValues = []ZebraType{
+	"plains",
+	"mountain",
+	"grevys",
+}
+
+func (v *ZebraType) UnmarshalJSON(src []byte) error {
+	var value string
+	err := json.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	enumTypeValue := ZebraType(value)
+	for _, existing := range AllowedZebraTypeEnumValues {
+		if existing == enumTypeValue {
+			*v = enumTypeValue
+			return nil
+		}
+	}
+
+	return fmt.Errorf("%+v is not a valid ZebraType", value)
+}
+
+// NewZebraTypeFromValue returns a pointer to a valid ZebraType
+// for the value passed as argument, or an error if the value passed is not allowed by the enum
+func NewZebraTypeFromValue(v string) (*ZebraType, error) {
+	ev := ZebraType(v)
+	if ev.IsValid() {
+		return &ev, nil
+	} else {
+		return nil, fmt.Errorf("invalid value '%v' for ZebraType: valid values are %v", v, AllowedZebraTypeEnumValues)
+	}
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise
+func (v ZebraType) IsValid() bool {
+	for _, existing := range AllowedZebraTypeEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to zebra_type value
+func (v ZebraType) Ptr() *ZebraType {
+	return &v
+}
+
+type NullableZebraType struct {
+	value *ZebraType
+	isSet bool
+}
+
+func (v NullableZebraType) Get() *ZebraType {
+	return v.value
+}
+
+func (v *NullableZebraType) Set(val *ZebraType) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableZebraType) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableZebraType) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableZebraType(val *ZebraType) *NullableZebraType {
+	return &NullableZebraType{value: val, isSet: true}
+}
+
+func (v NullableZebraType) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableZebraType) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+