Different approach

OpenAPITools · May 3, 2024 · 3d94276 · 3d94276
1 parent b8696d9
commit 3d94276
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
@@ -866,6 +866,8 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
     }
 
     private ModelsMap postProcessModelsMap(ModelsMap objs) {
+        // process enum in models
+        objs = postProcessModelsEnum(objs);
 
         // TODO: migrate almost (all?) everything to the `PythonImports` class.
         TreeSet<String> modelImports = new TreeSet<>();
@@ -990,7 +992,10 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
                         enumVars.put("name", toEnumVariableName((String) enumVars.get("value"), "str"));
                     } else {
                         model.vendorExtensions.putIfAbsent("x-py-enum-type", "int");
-                        enumVars.put("name", toEnumVariableName((String) enumVars.get("value"), "int"));
+                        // Do not overwrite the variable name if already set through x-enum-varnames
+                        if (model.vendorExtensions.get("x-enum-varnames") == null) {
+                            enumVars.put("name", toEnumVariableName((String) enumVars.get("value"), "int"));
+                        }
                     }
                 }
             }
@@ -1038,8 +1043,7 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
             }
         }
 
-        // process enum in models
-        return postProcessModelsEnum(objs);
+        return objs;
     }