fix: add Java contraints annotations at the field level (#1067)

Co-authored-by: Artur Ciocanu <ciocanu@adobe.com>
asyncapi · Dec 21, 2022 · cc1890a · cc1890a
1 parent 13edf11
commit cc1890a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
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
@@ -3,28 +3,28 @@
 exports[`Should be able to generate models with javax.validation.constraints annotations and should log expected output to console 1`] = `
 Array [
   "public class JavaxAnnotation {
+  @NotNull
+  @Min(0)
   private Double minNumberProp;
+  @NotNull
+  @Max(99)
   private Double maxNumberProp;
+  @Size(min=2, max=3)
   private Object[] arrayProp;
+  @Pattern(regexp=\\"^I_\\")
+  @Size(min=3)
   private String stringProp;
   private Map<String, Object> additionalProperties;
 
-  @NotNull
-  @Min(0)
   public Double getMinNumberProp() { return this.minNumberProp; }
   public void setMinNumberProp(Double minNumberProp) { this.minNumberProp = minNumberProp; }
 
-  @NotNull
-  @Max(99)
   public Double getMaxNumberProp() { return this.maxNumberProp; }
   public void setMaxNumberProp(Double maxNumberProp) { this.maxNumberProp = maxNumberProp; }
 
-  @Size(min=2, max=3)
   public Object[] getArrayProp() { return this.arrayProp; }
   public void setArrayProp(Object[] arrayProp) { this.arrayProp = arrayProp; }
 
-  @Pattern(regexp=\\"^I_\\")
-  @Size(min=3)
   public String getStringProp() { return this.stringProp; }
   public void setStringProp(String stringProp) { this.stringProp = stringProp; }
 

diff --git a/src/generators/java/presets/ConstraintsPreset.ts b/src/generators/java/presets/ConstraintsPreset.ts
@@ -13,7 +13,7 @@ export const JAVA_CONSTRAINTS_PRESET: JavaPreset = {
       return content;
     },
     // eslint-disable-next-line sonarjs/cognitive-complexity
-    getter({ renderer, property, content }) {
+    property({ renderer, property, content }) {
       const annotations: string[] = [];
 
       if (property.required) {

diff --git a/test/generators/java/presets/ConstraintsPreset.spec.ts b/test/generators/java/presets/ConstraintsPreset.spec.ts
@@ -6,7 +6,7 @@ describe('JAVA_CONSTRAINTS_PRESET', () => {
     generator = new JavaGenerator({ presets: [JAVA_CONSTRAINTS_PRESET] });
   });
 
-  test('should render constaints annotations', async () => {
+  test('should render constraints annotations', async () => {
     const doc = {
       $id: 'Clazz',
       type: 'object',

diff --git a/test/generators/java/presets/__snapshots__/ConstraintsPreset.spec.ts.snap b/test/generators/java/presets/__snapshots__/ConstraintsPreset.spec.ts.snap
@@ -1,29 +1,29 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`JAVA_CONSTRAINTS_PRESET should render constaints annotations 1`] = `
+exports[`JAVA_CONSTRAINTS_PRESET should render constraints annotations 1`] = `
 "public class Clazz {
+  @NotNull
+  @Min(0)
   private Double minNumberProp;
+  @NotNull
+  @Max(99)
   private Double maxNumberProp;
+  @Size(min=2, max=3)
   private Object[] arrayProp;
+  @Pattern(regexp=\\"^I_\\")
+  @Size(min=3)
   private String stringProp;
   private Map<String, Object> additionalProperties;
 
-  @NotNull
-  @Min(0)
   public Double getMinNumberProp() { return this.minNumberProp; }
   public void setMinNumberProp(Double minNumberProp) { this.minNumberProp = minNumberProp; }
 
-  @NotNull
-  @Max(99)
   public Double getMaxNumberProp() { return this.maxNumberProp; }
   public void setMaxNumberProp(Double maxNumberProp) { this.maxNumberProp = maxNumberProp; }
 
-  @Size(min=2, max=3)
   public Object[] getArrayProp() { return this.arrayProp; }
   public void setArrayProp(Object[] arrayProp) { this.arrayProp = arrayProp; }
 
-  @Pattern(regexp=\\"^I_\\")
-  @Size(min=3)
   public String getStringProp() { return this.stringProp; }
   public void setStringProp(String stringProp) { this.stringProp = stringProp; }