fix: discriminator with special character and default (#2333)

Author: reinaut-krekels-acerta

src/generators/java/renderers/ClassRenderer.ts

@@ -270,15 +270,15 @@ export const JAVA_DEFAULT_CLASS_PRESET: ClassPresetType<JavaOptions> = {
     }
 
     const isDiscriminatorProperty =
-      property.propertyName === model.options.discriminator?.discriminator;
+      property.unconstrainedPropertyName ===
+      model.options.discriminator?.discriminator;
     if (!isDiscriminatorProperty && property.property.originalInput?.default) {
       return JavaDefaultRendererUtil.renderFieldWithDefault(property);
     }
 
     if (
       options.useModelNameAsConstForDiscriminatorProperty &&
-      property.unconstrainedPropertyName ===
-        model.options.discriminator?.discriminator &&
+      isDiscriminatorProperty &&
       property.property.type === 'String'
     ) {
       return `private final ${property.property.type} ${property.propertyName} = "${model.name}";`;

test/generators/java/JavaGenerator.spec.ts

@@ -889,6 +889,106 @@ describe('JavaGenerator', () => {
     });
   });
 
+  describe('renders discriminator containing a special character', () => {
+    test('when discriminator has a default', async () => {
+      // note: the default discriminator value is not used in the output. See JacksonPreset.spec.ts for that.
+
+      const asyncapiDoc = {
+        asyncapi: '3.0.0',
+        info: {
+          title: 'Pet Owner example',
+          version: '1.0.0'
+        },
+        channels: {
+          owner: {
+            address: 'owner',
+            messages: {
+              Pet: {
+                $ref: '#/components/messages/Owner'
+              }
+            }
+          }
+        },
+        operations: {
+          ownerAvailable: {
+            action: 'receive',
+            channel: {
+              $ref: '#/channels/owner'
+            }
+          }
+        },
+        components: {
+          messages: {
+            Owner: {
+              payload: {
+                schema: {
+                  $ref: '#/components/schemas/Owner'
+                }
+              }
+            }
+          },
+          schemas: {
+            Owner: {
+              title: 'Owner',
+              type: 'object',
+              properties: {
+                pets: {
+                  type: 'array',
+                  items: {
+                    $ref: '#/components/schemas/Pet'
+                  }
+                }
+              }
+            },
+            Pet: {
+              title: 'Pet',
+              type: 'object',
+              properties: {
+                '@type': {
+                  type: 'string',
+                  default: 'Fish'
+                }
+              },
+              required: ['@type'],
+              discriminator: '@type',
+              oneOf: [
+                {
+                  $ref: '#/components/schemas/Fish'
+                },
+                {
+                  $ref: '#/components/schemas/Bird'
+                }
+              ]
+            },
+            Bird: {
+              title: 'Bird',
+              type: 'object',
+              allOf: [
+                {
+                  $ref: '#/components/schemas/Pet'
+                }
+              ]
+            },
+            Fish: {
+              title: 'Fish',
+              type: 'object',
+              allOf: [
+                {
+                  $ref: '#/components/schemas/Pet'
+                }
+              ]
+            }
+          }
+        }
+      };
+      const generator = new JavaGenerator({
+        useModelNameAsConstForDiscriminatorProperty: true
+      });
+      const models = await generator.generate(asyncapiDoc);
+      expect(models.map((model) => model.result)).toMatchSnapshot();
+    });
+  });
+
   describe('when collection type is list and unique items is true it should render a set', () => {
     test('should create a set for unique arrays', async () => {
       const asyncapiDoc = {

test/generators/java/__snapshots__/JavaGenerator.spec.ts.snap

@@ -1727,6 +1727,41 @@ Array [
 ]
 `;
 
+exports[`JavaGenerator renders discriminator containing a special character when discriminator has a default 1`] = `
+Array [
+  "/**
+ * Pet represents a union of types: Fish, Bird
+ */
+public interface Pet {
+  String getAtType();
+}",
+  "public class Owner {
+  private Pet[] pets;
+
+  public Pet[] getPets() { return this.pets; }
+  public void setPets(Pet[] pets) { this.pets = pets; }
+}",
+  "public class Fish implements Pet {
+  private final String atType = \\"Fish\\";
+  private Map<String, Object> additionalProperties;
+
+  public String getAtType() { return this.atType; }
+
+  public Map<String, Object> getAdditionalProperties() { return this.additionalProperties; }
+  public void setAdditionalProperties(Map<String, Object> additionalProperties) { this.additionalProperties = additionalProperties; }
+}",
+  "public class Bird implements Pet {
+  private final String atType = \\"Bird\\";
+  private Map<String, Object> additionalProperties;
+
+  public String getAtType() { return this.atType; }
+
+  public Map<String, Object> getAdditionalProperties() { return this.additionalProperties; }
+  public void setAdditionalProperties(Map<String, Object> additionalProperties) { this.additionalProperties = additionalProperties; }
+}",
+]
+`;
+
 exports[`JavaGenerator should not render optional imports when only required field 1`] = `
 "public class OtherClass {
   private String color;