Fix enum and map of enum issue (regression)

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -341,6 +341,30 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
                 updateCodegenPropertyEnum(var);
             }
 
+            for (CodegenProperty var : cm.allVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
+            for (CodegenProperty var : cm.requiredVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
+            for (CodegenProperty var : cm.optionalVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
+            for (CodegenProperty var : cm.parentVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
+            for (CodegenProperty var : cm.readOnlyVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
+            for (CodegenProperty var : cm.readWriteVars) {
+                updateCodegenPropertyEnum(var);
+            }
+
         }
         return objs;
     }
@@ -2301,6 +2325,8 @@ protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
             if (property.defaultValue != null) {
                 property.defaultValue = property.defaultValue.replace(", " + property.items.baseType, ", " + toEnumName(property.items));
             }
+
+            updateCodegenPropertyEnum(property);
         }
     }
 

samples/client/petstore/java/google-api-client/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/jersey1/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/jersey2-java6/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/jersey2-java8/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/jersey2/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/okhttp-gson/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/rest-assured/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/resteasy/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/resttemplate-withXml/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/resttemplate/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2-play24/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2-play25/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2-play26/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2rx/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/retrofit2rx2/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/vertx/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/java/webclient/docs/MapTest.md

@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 ## Enum: Map<String, InnerEnum>
 Name | Value
 ---- | -----
+UPPER | "UPPER"
+LOWER | "lower"
 
 
 

samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php

@@ -173,6 +173,8 @@ public function getModelName()
         return self::$openAPIModelName;
     }
 
+    const MAP_OF_ENUM_STRING_UPPER = 'UPPER';
+    const MAP_OF_ENUM_STRING_LOWER = 'lower';
 
 
 
@@ -184,7 +186,8 @@ public function getModelName()
     public function getMapOfEnumStringAllowableValues()
     {
         return [
-
+            self::MAP_OF_ENUM_STRING_UPPER,
+            self::MAP_OF_ENUM_STRING_LOWER,
         ];
     }
 

samples/client/petstore/swift4/default/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.0.0-SNAPSHOT

samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php

@@ -173,6 +173,8 @@ public function getModelName()
         return self::$openAPIModelName;
     }
 
+    const MAP_OF_ENUM_STRING_UPPER = 'UPPER';
+    const MAP_OF_ENUM_STRING_LOWER = 'lower';
 
 
 
@@ -184,7 +186,8 @@ public function getModelName()
     public function getMapOfEnumStringAllowableValues()
     {
         return [
-
+            self::MAP_OF_ENUM_STRING_UPPER,
+            self::MAP_OF_ENUM_STRING_LOWER,
         ];
     }