fix: the Java Constraint Generator omits @Valid annotation (#2176)

asyncapi · Feb 8, 2025 · 2387ef0 · 2387ef0
1 parent 69e49c9
commit 2387ef0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/examples/java-generate-jakarta-constraint-annotation/__snapshots__/index.spec.ts.snap b/examples/java-generate-jakarta-constraint-annotation/__snapshots__/index.spec.ts.snap
@@ -9,6 +9,7 @@ Array [
   @NotNull
   @Max(99)
   private double maxNumberProp;
+  @Valid
   @Size(min=2, max=3)
   private Object[] arrayProp;
   @Pattern(regexp=\\"^I_\\")

diff --git a/examples/java-generate-javax-constraint-annotation/__snapshots__/index.spec.ts.snap b/examples/java-generate-javax-constraint-annotation/__snapshots__/index.spec.ts.snap
@@ -9,6 +9,7 @@ Array [
   @NotNull
   @Max(99)
   private double maxNumberProp;
+  @Valid
   @Size(min=2, max=3)
   private Object[] arrayProp;
   @Pattern(regexp=\\"^I_\\")

diff --git a/src/generators/java/presets/ConstraintsPreset.ts b/src/generators/java/presets/ConstraintsPreset.ts
@@ -2,6 +2,8 @@ import {
   ConstrainedArrayModel,
   ConstrainedFloatModel,
   ConstrainedIntegerModel,
+  ConstrainedObjectModel,
+  ConstrainedReferenceModel,
   ConstrainedStringModel
 } from '../../../models';
 import { JavaPreset } from '../JavaPreset';
@@ -33,6 +35,15 @@ export const JAVA_CONSTRAINTS_PRESET: JavaPreset<JavaConstraintsPresetOptions> =
 
         const annotations: string[] = [];
 
+        // needs cascade validation
+        if (
+          property.property instanceof ConstrainedReferenceModel ||
+          property.property instanceof ConstrainedObjectModel ||
+          property.property instanceof ConstrainedArrayModel
+        ) {
+          annotations.push(renderer.renderAnnotation('Valid'));
+        }
+
         if (property.required) {
           annotations.push(renderer.renderAnnotation('NotNull'));
         }

diff --git a/test/generators/java/__snapshots__/JavaGenerator.spec.ts.snap b/test/generators/java/__snapshots__/JavaGenerator.spec.ts.snap
@@ -196,6 +196,7 @@ public interface Vehicle {
 exports[`JavaGenerator oneOf/discriminator with jackson preset date-time format should render java.time.OffsetDateTime 1`] = `
 Array [
   "public class Event {
+  @Valid
   @NotNull
   @JsonProperty(\\"action\\")
   private Action action;
@@ -311,6 +312,7 @@ public interface Pet {
   @NotNull
   @JsonProperty(\\"specversion\\")
   private final String specversion = \\"1.0\\";
+  @Valid
   @NotNull
   @JsonProperty(\\"type\\")
   private final CloudEventType type = CloudEventType.DOG;
@@ -431,6 +433,7 @@ public interface Pet {
   @NotNull
   @JsonProperty(\\"specversion\\")
   private final String specversion = \\"1.0\\";
+  @Valid
   @NotNull
   @JsonProperty(\\"type\\")
   private final CloudEventType type = CloudEventType.CAT;
@@ -521,6 +524,7 @@ Array [
   @NotNull
   @JsonProperty(\\"id\\")
   private String id;
+  @Valid
   @NotNull
   @JsonProperty(\\"type\\")
   private final CloudEventType type = CloudEventType.DOG;
@@ -623,6 +627,7 @@ public interface Pet {
   
 }",
   "public class Dog implements Pet {
+  @Valid
   @NotNull
   @JsonProperty(\\"type\\")
   private final DogType type = DogType.DOG;
@@ -704,6 +709,7 @@ public interface Pet {
   }
 }",
   "public class Cat implements Pet {
+  @Valid
   @NotNull
   @JsonProperty(\\"type\\")
   private final CatType type = CatType.CAT;
@@ -801,6 +807,7 @@ public interface Vehicle {
   VehicleType getVehicleType();
 }",
   "public class Cargo {
+  @Valid
   @JsonProperty(\\"vehicle\\")
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private Vehicle vehicle;
@@ -854,6 +861,7 @@ public interface Vehicle {
   }
 }",
   "public class Car implements Vehicle {
+  @Valid
   @NotNull
   @JsonProperty(\\"vehicleType\\")
   private final VehicleType vehicleType = VehicleType.CAR;
@@ -935,6 +943,7 @@ public interface Vehicle {
   }
 }",
   "public class Truck implements Vehicle {
+  @Valid
   @NotNull
   @JsonProperty(\\"vehicleType\\")
   private final VehicleType vehicleType = VehicleType.TRUCK;

diff --git a/test/generators/java/presets/__snapshots__/ConstraintsPreset.spec.ts.snap b/test/generators/java/presets/__snapshots__/ConstraintsPreset.spec.ts.snap
@@ -30,6 +30,7 @@ exports[`JAVA_CONSTRAINTS_PRESET should render jakarta constraints annotations f
   @NotNull
   @Max(99)
   private double maxNumberProp;
+  @Valid
   @Size(min=2, max=3)
   private Object[] arrayProp;
   @Pattern(regexp=\\"^\\\\\\\\w+(\\\\\\"\\\\\\\\.\\\\\\\\w+)*$\\")
@@ -62,6 +63,7 @@ exports[`JAVA_CONSTRAINTS_PRESET should render javax constraints annotations by
   @NotNull
   @Max(99)
   private double maxNumberProp;
+  @Valid
   @Size(min=2, max=3)
   private Object[] arrayProp;
   @Pattern(regexp=\\"^\\\\\\\\w+(\\\\\\"\\\\\\\\.\\\\\\\\w+)*$\\")
@@ -94,6 +96,7 @@ exports[`JAVA_CONSTRAINTS_PRESET should render javax constraints annotations whe
   @NotNull
   @Max(99)
   private double maxNumberProp;
+  @Valid
   @Size(min=2, max=3)
   private Object[] arrayProp;
   @Pattern(regexp=\\"^\\\\\\\\w+(\\\\\\"\\\\\\\\.\\\\\\\\w+)*$\\")