fix: classes implementing union should not have discriminator setter (#2251)

Author: ThomasVerhoeven1998

src/generators/java/JavaPreset.ts

@@ -48,9 +48,6 @@ export interface UnionPreset<R extends AbstractRenderer, O>
   discriminatorGetter?: (
     args: PresetArgs<R, O, ConstrainedUnionModel>
   ) => string;
-  discriminatorSetter?: (
-    args: PresetArgs<R, O, ConstrainedUnionModel>
-  ) => string;
 }
 
 export type RecordPresetType<O> = InterfacePreset<RecordRenderer, O>;

src/generators/java/renderers/ClassRenderer.ts

@@ -46,13 +46,13 @@ export class ClassRenderer extends JavaRenderer<ConstrainedObjectModel> {
         this.dependencyManager.addModelDependency(i);
       }
 
-      const inheritanceKeyworkd = this.model.options.isExtended
+      const inheritanceKeyword = this.model.options.isExtended
         ? 'extends'
         : 'implements';
 
       return `public ${abstractType} ${
         this.model.name
-      } ${inheritanceKeyworkd} ${parents.map((i) => i.name).join(', ')} {
+      } ${inheritanceKeyword} ${parents.map((i) => i.name).join(', ')} {
 ${this.indent(this.renderBlock(content, 2))}
 }`;
     }
@@ -138,7 +138,10 @@ const getOverride = (
   property: ConstrainedObjectPropertyModel
 ) => {
   const isOverride = model.options.extend?.find((extend) => {
-    if (!extend.options.isExtended || isDictionary(model, property)) {
+    if (
+      !extend.options.isExtended ||
+      property.property instanceof ConstrainedDictionaryModel
+    ) {
       return false;
     }
 
@@ -166,12 +169,18 @@ export const isDiscriminatorOrDictionary = (
   property: ConstrainedObjectPropertyModel
 ): boolean =>
   model.options.discriminator?.discriminator ===
-    property.unconstrainedPropertyName || isDictionary(model, property);
+    property.unconstrainedPropertyName ||
+  property.property instanceof ConstrainedDictionaryModel;
 
-export const isDictionary = (
+export const isDiscriminatorInTree = (
   model: ConstrainedObjectModel,
   property: ConstrainedObjectPropertyModel
-): boolean => property.property instanceof ConstrainedDictionaryModel;
+): boolean =>
+  model.options?.extend?.some(
+    (ext) =>
+      ext?.options?.discriminator?.discriminator ===
+      property.unconstrainedPropertyName
+  ) ?? false;
 
 const isEnumImplementedByConstValue = (
   model: ConstrainedObjectModel,
@@ -269,6 +278,10 @@ export const JAVA_DEFAULT_CLASS_PRESET: ClassPresetType<JavaOptions> = {
       return `public void set${setterName}(${property.property.type} ${property.propertyName});`;
     }
 
+    if (isDiscriminatorInTree(model, property)) {
+      return '';
+    }
+
     // don't render override for enums that are set with a const value
     const override = !isEnumOrEnumInExtended(model, property)
       ? getOverride(model, property)

src/generators/java/renderers/UnionRenderer.ts

@@ -21,7 +21,6 @@ export class UnionRenderer extends JavaRenderer<ConstrainedUnionModel> {
 
     if (this.model.options.discriminator) {
       content.push(await this.runDiscriminatorGetterPreset());
-      content.push(await this.runDiscriminatorSetterPreset());
     }
     content.push(await this.runAdditionalContentPreset());
 
@@ -36,10 +35,6 @@ export class UnionRenderer extends JavaRenderer<ConstrainedUnionModel> {
   runDiscriminatorGetterPreset(): Promise<string> {
     return this.runPreset('discriminatorGetter');
   }
-
-  runDiscriminatorSetterPreset(): Promise<string> {
-    return this.runPreset('discriminatorSetter');
-  }
 }
 
 export const JAVA_DEFAULT_UNION_PRESET: UnionPresetType<JavaOptions> = {
@@ -54,17 +49,6 @@ export const JAVA_DEFAULT_UNION_PRESET: UnionPresetType<JavaOptions> = {
     return `${model.options.discriminator.type} get${FormatHelpers.toPascalCase(
       getSanitizedDiscriminatorName(model)
     )}();`;
-  },
-  discriminatorSetter({ model }) {
-    if (!model.options.discriminator?.type) {
-      return '';
-    }
-
-    return `void set${FormatHelpers.toPascalCase(
-      getSanitizedDiscriminatorName(model)
-    )}(${model.options.discriminator.type} ${FormatHelpers.toCamelCase(
-      getSanitizedDiscriminatorName(model)
-    )});`;
   }
 };
 

test/generators/java/JavaGenerator.spec.ts

@@ -480,7 +480,7 @@ describe('JavaGenerator', () => {
         ],
         collectionType: 'List',
         processorOptions: {
-          interpreter: {
+          jsonSchema: {
             allowInheritance: true
           }
         }

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

@@ -12,7 +12,6 @@ Array [
  */
 public interface Animal {
   String getPetType();
-  void setPetType(String petType);
 }",
   "public class Boxer implements Animal, Dog {
   @JsonProperty(\\"breed\\")
@@ -32,8 +31,6 @@ public interface Animal {
 
   @Override
   public String getPetType() { return this.petType; }
-  @Override
-  public void setPetType(String petType) { this.petType = petType; }
 
   @Override
   public String getColor() { return this.color; }
@@ -107,8 +104,6 @@ public interface Animal {
 
   @Override
   public String getPetType() { return this.petType; }
-  @Override
-  public void setPetType(String petType) { this.petType = petType; }
 
   @Override
   public String getColor() { return this.color; }
@@ -175,7 +170,6 @@ Array [
  */
 public interface Pet {
   String getPetType();
-  void setPetType(String petType);
 }",
   "public class Owner {
   @JsonProperty(\\"name\\")
@@ -365,7 +359,6 @@ public interface Pet {
   private Map<String, Object> additionalProperties;
 
   public String getPetType() { return this.petType; }
-  public void setPetType(String petType) { this.petType = petType; }
 
   public String getBreed() { return this.breed; }
 
@@ -428,7 +421,6 @@ Array [
  */
 public interface Animal {
   String getAtPetType();
-  void setAtPetType(String atPetType);
 }",
   "public class FlyingFish implements Animal, Fish {
   @JsonProperty(\\"breed\\")
@@ -445,8 +437,6 @@ public interface Animal {
 
   @Override
   public String getAtPetType() { return this.atPetType; }
-  @Override
-  public void setAtPetType(String atPetType) { this.atPetType = atPetType; }
 
   @JsonAnyGetter
   public Map<String, Object> getAdditionalProperties() { return this.additionalProperties; }
@@ -508,8 +498,6 @@ public interface Animal {
 
   @Override
   public String getAtPetType() { return this.atPetType; }
-  @Override
-  public void setAtPetType(String atPetType) { this.atPetType = atPetType; }
 
   @JsonAnyGetter
   public Map<String, Object> getAdditionalProperties() { return this.additionalProperties; }
@@ -563,7 +551,6 @@ Array [
  */
 public interface Vehicle {
   VehicleType getVehicleType();
-  void setVehicleType(VehicleType vehicleType);
 }",
   "public class Car implements Vehicle {
   private final VehicleType vehicleType = VehicleType.CAR;
@@ -721,7 +708,6 @@ Array [
  */
 public interface Pet {
   CloudEventType getType();
-  void setType(CloudEventType type);
 }",
   "public class Dog implements Pet {
   @NotNull
@@ -1226,7 +1212,6 @@ Array [
  */
 public interface Vehicle {
   VehicleType getVehicleType();
-  void setVehicleType(VehicleType vehicleType);
 }",
   "public class Cargo {
   @Valid

test/generators/java/presets/__snapshots__/JacksonPreset.spec.ts.snap

@@ -93,7 +93,6 @@ Array [
  */
 public interface Vehicle {
   String getVehicleType();
-  void setVehicleType(String vehicleType);
 }",
   "public class Car implements Vehicle {
   @JsonProperty(\\"vehicle_type\\")
@@ -152,7 +151,6 @@ Array [
  */
 public interface Vehicle {
   String getVehicleType();
-  void setVehicleType(String vehicleType);
 }",
   "public class Car implements Vehicle {
   @JsonProperty(\\"vehicleType\\")
@@ -199,7 +197,6 @@ Array [
  */
 public interface Vehicle {
   String getVehicleType();
-  void setVehicleType(String vehicleType);
 }",
   "public class Car implements Vehicle {
   @JsonProperty(\\"vehicleType\\")