Merge branch 'master' into all-contributors/add-istvan-nagy-epam

Author: jonaslagoni

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_\\")

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_\\")

modelina-cli/README.md

@@ -162,7 +162,7 @@ $ npm install -g @asyncapi/modelina-cli
 $ modelina COMMAND
 running command...
 $ modelina (--version)
-@asyncapi/modelina-cli/4.0.0-next.65 linux-x64 node-v18.20.5
+@asyncapi/modelina-cli/4.0.0 linux-x64 node-v18.20.6
 $ modelina --help [COMMAND]
 USAGE
   $ modelina COMMAND
@@ -240,7 +240,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/index.ts)_
 
 ## `modelina config context`
 
@@ -254,7 +254,7 @@ DESCRIPTION
   Manage short aliases for full paths to inputs
 ```
 
-_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/index.ts)_
+_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/index.ts)_
 
 ## `modelina config context add CONTEXT-NAME SPEC-FILE-PATH`
 
@@ -276,7 +276,7 @@ DESCRIPTION
   Add a context to the store
 ```
 
-_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/add.ts)_
+_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/add.ts)_
 
 ## `modelina config context current`
 
@@ -293,7 +293,7 @@ DESCRIPTION
   Shows the current context that is being used
 ```
 
-_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/current.ts)_
+_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/current.ts)_
 
 ## `modelina config context edit CONTEXT-NAME NEW-SPEC-FILE-PATH`
 
@@ -314,7 +314,7 @@ DESCRIPTION
   Edit a context in the store
 ```
 
-_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/edit.ts)_
+_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/edit.ts)_
 
 ## `modelina config context init [CONTEXT-FILE-PATH]`
 
@@ -337,7 +337,7 @@ DESCRIPTION
   Initialize context
 ```
 
-_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/init.ts)_
+_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/init.ts)_
 
 ## `modelina config context list`
 
@@ -354,7 +354,7 @@ DESCRIPTION
   List all the stored contexts in the store
 ```
 
-_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/list.ts)_
+_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/list.ts)_
 
 ## `modelina config context remove CONTEXT-NAME`
 
@@ -374,7 +374,7 @@ DESCRIPTION
   Delete a context from the store
 ```
 
-_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/remove.ts)_
+_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/remove.ts)_
 
 ## `modelina config context use CONTEXT-NAME`
 
@@ -394,7 +394,7 @@ DESCRIPTION
   Set a context as current
 ```
 
-_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/config/context/use.ts)_
+_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/config/context/use.ts)_
 
 ## `modelina generate LANGUAGE FILE`
 
@@ -458,7 +458,7 @@ DESCRIPTION
   Generates typed models
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.65/modelina-cli/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0/modelina-cli/src/commands/generate.ts)_
 
 ## `modelina help [COMMAND]`
 

modelina-cli/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/modelina-cli",
   "description": "CLI to work with Modelina",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "bin": {
     "modelina": "./bin/run_bin"
   },

modelina-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Library for generating data models based on inputs such as AsyncAPI, OpenAPI, or JSON Schema documents",
   "license": "Apache-2.0",
   "homepage": "https://www.modelina.org",

package-lock.json

@@ -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'));
         }

package.json

@@ -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;

src/generators/java/presets/ConstraintsPreset.ts

@@ -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+)*$\\")