[rust-axum] Give polymorphic enum values a serde alias using the mapping keys if available

Author: KevinLiddle

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

@@ -656,15 +656,17 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
             final CodegenComposedSchemas cs = cm.getComposedSchemas();
             if (cs != null) {
                 final List<CodegenProperty> csOneOf = cs.getOneOf();
+                CodegenDiscriminator discriminator = cm.getDiscriminator();
+
                 if (csOneOf != null) {
-                    processPolymorphismDataType(csOneOf);
+                    processPolymorphismDataType(csOneOf, discriminator);
                     cs.setOneOf(csOneOf);
                     cm.setComposedSchemas(cs);
                 }
 
                 final List<CodegenProperty> csAnyOf = cs.getAnyOf();
                 if (csAnyOf != null) {
-                    processPolymorphismDataType(csAnyOf);
+                    processPolymorphismDataType(csAnyOf, discriminator);
                     cs.setAnyOf(csAnyOf);
                     cm.setComposedSchemas(cs);
                 }
@@ -721,6 +723,7 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
 
                     // Attributes based on the model name
                     property.defaultValue = String.format(Locale.ROOT, "r#\"%s\"#.to_string()", cm.getSchemaName());
+                    property.discriminatorValue = getDiscriminatorValue(cm.getClassname(), discriminator);
                     property.jsonSchema = String.format(Locale.ROOT, "{ \"default\":\"%s\"; \"type\":\"string\" }", cm.getSchemaName());
 
                     cm.vars.add(property);
@@ -743,6 +746,19 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
         }
     }
 
+    private static String getDiscriminatorValue(String modelName, CodegenDiscriminator discriminator) {
+        if (discriminator == null || discriminator.getMappedModels() == null) {
+            return modelName;
+        }
+        return discriminator
+                .getMappedModels()
+                .stream()
+                .filter(m -> m.getModelName().equals(modelName) && m.getMappingName() != null)
+                .map(CodegenDiscriminator.MappedModel::getMappingName)
+                .findFirst()
+                .orElse(modelName);
+    }
+
     private static boolean discriminating(final List<CodegenDiscriminator> discriminatorsForModel, final CodegenModel cm) {
         resetDiscriminatorProperty(cm);
 
@@ -773,7 +789,7 @@ private static void resetDiscriminatorProperty(final CodegenModel cm) {
         }
     }
 
-    private static void processPolymorphismDataType(final List<CodegenProperty> cp) {
+    private static void processPolymorphismDataType(final List<CodegenProperty> cp, CodegenDiscriminator discriminator) {
         final HashSet<String> dedupDataTypeWithEnum = new HashSet<>();
         final HashMap<String, Integer> dedupDataType = new HashMap<>();
 
@@ -783,6 +799,7 @@ private static void processPolymorphismDataType(final List<CodegenProperty> cp)
             // Mainly needed for primitive types.
             model.datatypeWithEnum = camelize(model.dataType.replaceAll("(?:\\w+::)+(\\w+)", "$1")
                     .replace("<", "Of").replace(">", "")).replace(" ", "").replace(",", "");
+            model.discriminatorValue = getDiscriminatorValue(model.datatypeWithEnum, discriminator);
             if (!dedupDataTypeWithEnum.add(model.datatypeWithEnum)) {
                 model.datatypeWithEnum += ++idx;
             }

modules/openapi-generator/src/main/resources/rust-axum/models.mustache

@@ -796,6 +796,9 @@ impl std::str::FromStr for {{{classname}}} {
 pub enum {{{classname}}} {
     {{#composedSchemas}}
     {{#anyOf}}
+    {{#discriminator}}
+    #[serde(alias = "{{{discriminatorValue}}}")]
+    {{/discriminator}}
     {{{datatypeWithEnum}}}({{{dataType}}}),
     {{/anyOf}}
     {{/composedSchemas}}
@@ -871,6 +874,9 @@ impl From<{{{dataType}}}> for {{{classname}}} {
 pub enum {{{classname}}} {
     {{#composedSchemas}}
     {{#oneOf}}
+    {{#discriminator}}
+    #[serde(alias = "{{{discriminatorValue}}}")]
+    {{/discriminator}}
     {{{datatypeWithEnum}}}({{{dataType}}}),
     {{/oneOf}}
     {{/composedSchemas}}
@@ -1071,7 +1077,7 @@ pub struct {{{classname}}} {
 {{#isString}}
 impl {{{classname}}} {
     fn _name_for_{{{name}}}() -> String {
-        String::from("{{{classname}}}")
+        String::from("{{#discriminatorValue}}{{{discriminatorValue}}}{{/discriminatorValue}}{{^discriminatorValue}}{{classname}}{{/discriminatorValue}}")
     }
 
     fn _serialize_{{{name}}}<S>(_: &String, s: S) -> Result<S::Ok, S::Error>