Initialize discriminator enum field

david-marconis · david-marconis · commit 3f2a342ae64e · 2024-10-23T09:34:51.000+02:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -3080,6 +3080,7 @@ public CodegenModel fromModel(String name, Schema schema) {
             listOLists.add(m.requiredVars);
             listOLists.add(m.vars);
             listOLists.add(m.allVars);
+            listOLists.add(m.readWriteVars);
             for (List<CodegenProperty> theseVars : listOLists) {
                 for (CodegenProperty requiredVar : theseVars) {
                     if (discPropName.equals(requiredVar.baseName)) {
@@ -3113,6 +3114,37 @@ public CodegenModel fromModel(String name, Schema schema) {
         return m;
     }
 
+    protected static void setEnumDiscriminatorDefaultValue(CodegenModel model) {
+        if (model.discriminator == null) {
+            return;
+        }
+        String discPropName = model.discriminator.getPropertyBaseName();
+        Stream.of(model.requiredVars, model.vars, model.allVars, model.readWriteVars)
+                .flatMap(List::stream)
+                .filter(v -> discPropName.equals(v.baseName))
+                .forEach(v -> v.defaultValue = getEnumValueForProperty(model.schemaName, model.discriminator, v));
+    }
+
+    protected static String getEnumValueForProperty(
+            String modelName, CodegenDiscriminator discriminator, CodegenProperty var) {
+        if (!discriminator.getIsEnum() && !var.isEnum) {
+            return null;
+        }
+        Map<String, String> mapping = Optional.ofNullable(discriminator.getMapping()).orElseGet(Collections::emptyMap);
+        for (Map.Entry<String, String> e : mapping.entrySet()) {
+            String schemaName = e.getValue().indexOf('/') < 0 ? e.getValue() : ModelUtils.getSimpleRef(e.getValue());
+            if (modelName.equals(schemaName)) {
+                return e.getKey();
+            }
+        }
+        Object values = var.allowableValues.get("values");
+        if (!(values instanceof List<?>)) {
+            return null;
+        }
+        List<?> valueList = (List<?>) values;
+        return valueList.stream().filter(o -> o.equals(modelName)).map(o -> (String) o).findAny().orElse(null);
+    }
+
     protected void SortModelPropertiesByRequiredFlag(CodegenModel model) {
         Comparator<CodegenProperty> comparator = new Comparator<CodegenProperty>() {
             @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -1700,6 +1700,7 @@ public CodegenModel fromModel(String name, Schema model) {
 
         // additional import for different cases
         addAdditionalImports(codegenModel, codegenModel.getComposedSchemas());
+        setEnumDiscriminatorDefaultValue(codegenModel);
         return codegenModel;
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -425,6 +425,7 @@ public String apiTestFileFolder() {
     public CodegenModel fromModel(String name, Schema model) {
         Map<String, Schema> allDefinitions = ModelUtils.getSchemas(this.openAPI);
         CodegenModel codegenModel = super.fromModel(name, model);
+        setEnumDiscriminatorDefaultValue(codegenModel);
         if (allDefinitions != null && codegenModel != null && codegenModel.parent != null) {
             final Schema<?> parentModel = allDefinitions.get(toModelName(codegenModel.parent));
             if (parentModel != null) {
@@ -439,22 +440,7 @@ public CodegenModel fromModel(String name, Schema model) {
                 }
 
                 for (final CodegenProperty property : codegenModel.readWriteVars) {
-                    CodegenDiscriminator discriminator = parentCodegenModel.discriminator;
-                    if (property.defaultValue != null || discriminator == null || !property.name.equals(discriminator.getPropertyName())) {
-                        continue;
-                    }
-                    if (discriminator.getIsEnum()) {
-                        String enumValue = name;
-                        Map<String, String> mapping = Optional.ofNullable(discriminator.getMapping()).orElseGet(Collections::emptyMap);
-                        for (Map.Entry<String, String> e : mapping.entrySet()) {
-                            String schemaName = e.getValue().indexOf('/') < 0 ? e.getValue() : ModelUtils.getSimpleRef(e.getValue());
-                            if (name.equals(schemaName)) {
-                                enumValue = e.getKey();
-                                break;
-                            }
-                        }
-                        property.defaultValue = toEnumDefaultValue(property, enumValue);
-                    } else {
+                    if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) {
                         property.defaultValue = "\"" + name + "\"";
                     }
                 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -80,6 +80,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{/parcelableModel}}
     {{/parent}}
     {{#discriminator}}
+    {{#discriminator.isEnum}}
+{{#readWriteVars}}{{#isDiscriminator}}{{#defaultValue}}
+    this.{{name}} = {{defaultValue}};
+{{/defaultValue}}{{/isDiscriminator}}{{/readWriteVars}}
+    {{/discriminator.isEnum}}
     {{^discriminator.isEnum}}
     this.{{{discriminatorName}}} = this.getClass().getSimpleName();
     {{/discriminator.isEnum}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -2298,20 +2298,25 @@ public void testEnumDiscriminatorDefaultValueIsNotString() {
         Map<String, File> files = new DefaultGenerator().opts(new ClientOptInput().openAPI(openAPI).config(codegen))
                 .generate().stream().collect(Collectors.toMap(File::getName, Function.identity()));
 
-        List<String> entities = List.of(
-                "Cat",
-                "Dog",
-                "Gecko",
-                "Chameleon",
-                "MiniVan",
-                "CargoVan",
-                "SUV",
-                "Truck",
-                "Sedan");
-        for (String entity : entities) {
-            File entityFile = files.get(entity + ".java");
+        Map<String, String> expectedContents = Map.of(
+                "Cat", "this.petType = PetTypeEnum.CATTY",
+                "Dog", "this.petType = PetTypeEnum.DOG",
+                "Gecko", "this.petType = PetTypeEnum.GECKO",
+                "Chameleon", "this.petType = PetTypeEnum.CAMO",
+                "MiniVan", "this.carType = CarType.MINI_VAN",
+                "CargoVan", "this.carType = CarType.CARGO_VAN",
+                "SUV", "this.carType = CarType.SUV",
+                "Truck", "this.carType = CarType.TRUCK",
+                "Sedan", "this.carType = CarType.SEDAN"
+
+        );
+        for (Map.Entry<String, String> e : expectedContents.entrySet()) {
+            String modelName = e.getKey();
+            String expectedContent = e.getValue();
+            File entityFile = files.get(modelName + ".java");
             assertNotNull(entityFile);
             assertThat(entityFile).content().doesNotContain("Type = this.getClass().getSimpleName();");
+            assertThat(entityFile).content().contains(expectedContent);
         }
     }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
@@ -107,6 +107,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   protected EnumStrTypeEnum enumStrType;
 
   public EnumStringDiscriminator() {
+
   }
 
   public EnumStringDiscriminator enumStrType(EnumStrTypeEnum enumStrType) {

Original file line number	Diff line number	Diff line change
`@@ -1700,6 +1700,7 @@ public CodegenModel fromModel(String name, Schema model) {`
`1700`	`1700`
`1701`	`1701`	`// additional import for different cases`
`1702`	`1702`	`addAdditionalImports(codegenModel, codegenModel.getComposedSchemas());`
	`1703`	`+ setEnumDiscriminatorDefaultValue(codegenModel);`
`1703`	`1704`	`return codegenModel;`
`1704`	`1705`	`}`
`1705`	`1706`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti`
`107`	`107`	`protected EnumStrTypeEnum enumStrType;`
`108`	`108`
`109`	`109`	`public EnumStringDiscriminator() {`
	`110`	`+`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`public EnumStringDiscriminator enumStrType(EnumStrTypeEnum enumStrType) {`