Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/java-generate-jakarta-constraint-annotation/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Array [
@NotNull
@Max(99)
private double maxNumberProp;
@Valid
@Size(min=2, max=3)
private Object[] arrayProp;
@Pattern(regexp=\\"^I_\\")
Expand Down
1 change: 1 addition & 0 deletions examples/java-generate-javax-constraint-annotation/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Array [
@NotNull
@Max(99)
private double maxNumberProp;
@Valid
@Size(min=2, max=3)
private Object[] arrayProp;
@Pattern(regexp=\\"^I_\\")
Expand Down
11 changes: 11 additions & 0 deletions src/generators/java/presets/ConstraintsPreset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import {
ConstrainedArrayModel,
ConstrainedFloatModel,
ConstrainedIntegerModel,
ConstrainedObjectModel,
ConstrainedReferenceModel,
ConstrainedStringModel
} from '../../../models';
import { JavaPreset } from '../JavaPreset';
Expand Down Expand Up @@ -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'));
}
Expand Down
9 changes: 9 additions & 0 deletions test/generators/java/__snapshots__/JavaGenerator.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -521,6 +524,7 @@ Array [
@NotNull
@JsonProperty(\\"id\\")
private String id;
@Valid
@NotNull
@JsonProperty(\\"type\\")
private final CloudEventType type = CloudEventType.DOG;
Expand Down Expand Up @@ -623,6 +627,7 @@ public interface Pet {

}",
"public class Dog implements Pet {
@Valid
@NotNull
@JsonProperty(\\"type\\")
private final DogType type = DogType.DOG;
Expand Down Expand Up @@ -704,6 +709,7 @@ public interface Pet {
}
}",
"public class Cat implements Pet {
@Valid
@NotNull
@JsonProperty(\\"type\\")
private final CatType type = CatType.CAT;
Expand Down Expand Up @@ -801,6 +807,7 @@ public interface Vehicle {
VehicleType getVehicleType();
}",
"public class Cargo {
@Valid
@JsonProperty(\\"vehicle\\")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Vehicle vehicle;
Expand Down Expand Up @@ -854,6 +861,7 @@ public interface Vehicle {
}
}",
"public class Car implements Vehicle {
@Valid
@NotNull
@JsonProperty(\\"vehicleType\\")
private final VehicleType vehicleType = VehicleType.CAR;
Expand Down Expand Up @@ -935,6 +943,7 @@ public interface Vehicle {
}
}",
"public class Truck implements Vehicle {
@Valid
@NotNull
@JsonProperty(\\"vehicleType\\")
private final VehicleType vehicleType = VehicleType.TRUCK;
Expand Down
3 changes: 3 additions & 0 deletions test/generators/java/presets/__snapshots__/ConstraintsPreset.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)*$\\")
Expand Down Expand Up @@ -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+)*$\\")
Expand Down Expand Up @@ -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+)*$\\")
Expand Down
Loading