[rust-axum] Make discriminator field name camelCase

Author: KevinLiddle

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

@@ -648,7 +648,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
     }
 
     private void postProcessPolymorphism(final List<ModelMap> allModels) {
-        final HashMap<String, List<String>> discriminatorsForModel = new HashMap<>();
+        final HashMap<String, List<CodegenDiscriminator>> discriminatorsForModel = new HashMap<>();
 
         for (final ModelMap mo : allModels) {
             final CodegenModel cm = mo.getModel();
@@ -672,14 +672,14 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
 
             if (cm.discriminator != null) {
                 for (final String model : cm.oneOf) {
-                    final List<String> discriminators = discriminatorsForModel.getOrDefault(model, new ArrayList<>());
-                    discriminators.add(cm.discriminator.getPropertyName());
+                    final List<CodegenDiscriminator> discriminators = discriminatorsForModel.getOrDefault(model, new ArrayList<>());
+                    discriminators.add(cm.discriminator);
                     discriminatorsForModel.put(model, discriminators);
                 }
 
                 for (final String model : cm.anyOf) {
-                    final List<String> discriminators = discriminatorsForModel.getOrDefault(model, new ArrayList<>());
-                    discriminators.add(cm.discriminator.getPropertyName());
+                    final List<CodegenDiscriminator> discriminators = discriminatorsForModel.getOrDefault(model, new ArrayList<>());
+                    discriminators.add(cm.discriminator);
                     discriminatorsForModel.put(model, discriminators);
                 }
             }
@@ -689,11 +689,11 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
         for (ModelMap mo : allModels) {
             final CodegenModel cm = mo.getModel();
 
-            final List<String> discriminators = discriminatorsForModel.get(cm.getSchemaName());
+            final List<CodegenDiscriminator> discriminators = discriminatorsForModel.get(cm.getSchemaName());
             if (discriminators != null) {
                 // If the discriminator field is not a defined attribute in the variant structure, create it.
                 if (!discriminating(discriminators, cm)) {
-                    final String discriminator = discriminators.get(0);
+                    final CodegenDiscriminator discriminator = discriminators.get(0);
 
                     CodegenProperty property = new CodegenProperty();
 
@@ -710,11 +710,11 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
                     property.isDiscriminator = true;
 
                     // Attributes based on the discriminator value
-                    property.baseName = discriminator;
-                    property.name = discriminator;
-                    property.nameInCamelCase = camelize(discriminator);
+                    property.baseName = discriminator.getPropertyBaseName();
+                    property.name = discriminator.getPropertyName();
+                    property.nameInCamelCase = camelize(discriminator.getPropertyName());
                     property.nameInPascalCase = property.nameInCamelCase.substring(0, 1).toUpperCase(Locale.ROOT) + property.nameInCamelCase.substring(1);
-                    property.nameInSnakeCase = underscore(discriminator).toUpperCase(Locale.ROOT);
+                    property.nameInSnakeCase = underscore(discriminator.getPropertyName()).toUpperCase(Locale.ROOT);
                     property.getter = String.format(Locale.ROOT, "get%s", property.nameInPascalCase);
                     property.setter = String.format(Locale.ROOT, "set%s", property.nameInPascalCase);
                     property.defaultValueWithParam = String.format(Locale.ROOT, " = data.%s;", property.name);
@@ -743,14 +743,14 @@ private void postProcessPolymorphism(final List<ModelMap> allModels) {
         }
     }
 
-    private static boolean discriminating(final List<String> discriminatorsForModel, final CodegenModel cm) {
+    private static boolean discriminating(final List<CodegenDiscriminator> discriminatorsForModel, final CodegenModel cm) {
         resetDiscriminatorProperty(cm);
 
         // Discriminator will be presented as enum tag -> One and only one tag is allowed
         int countString = 0;
         int countNonString = 0;
         for (final CodegenProperty var : cm.vars) {
-            if (discriminatorsForModel.stream().anyMatch(discriminator -> var.baseName.equals(discriminator) || var.name.equals(discriminator))) {
+            if (discriminatorsForModel.stream().anyMatch(discriminator -> var.baseName.equals(discriminator.getPropertyBaseName()) || var.name.equals(discriminator.getPropertyName()))) {
                 if (var.isString) {
                     var.isDiscriminator = true;
                     ++countString;