#48 - add packageName, simpleName and fieldName to MalioValidationExc…

…eption - done (#49)
NaluKit · Jun 10, 2023 · fd145af · fd145af
1 parent 471670e
commit fd145af
Show file tree

Hide file tree

Showing 26 changed files with 146 additions and 43 deletions.
diff --git a/...ava/com/github/nalukit/malio/shared/internal/constraint/ArrayItemMaxLengthConstraint.java b/...ava/com/github/nalukit/malio/shared/internal/constraint/ArrayItemMaxLengthConstraint.java
@@ -23,7 +23,7 @@
 public class ArrayItemMaxLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int maxLength;
+  private final int maxLength;
 
   public ArrayItemMaxLengthConstraint(String packageName,
                                       String simpleName,
@@ -40,7 +40,10 @@ public ArrayItemMaxLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() > maxLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...ava/com/github/nalukit/malio/shared/internal/constraint/ArrayItemMinLengthConstraint.java b/...ava/com/github/nalukit/malio/shared/internal/constraint/ArrayItemMinLengthConstraint.java
@@ -23,7 +23,7 @@
 public class ArrayItemMinLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int minLength;
+  private final int minLength;
 
   public ArrayItemMinLengthConstraint(String packageName,
                                       String simpleName,
@@ -40,7 +40,10 @@ public ArrayItemMinLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() < minLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...java/com/github/nalukit/malio/shared/internal/constraint/ArrayItemNotBlankConstraint.java b/...java/com/github/nalukit/malio/shared/internal/constraint/ArrayItemNotBlankConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(String value) {
   public void check(String value)
       throws MalioValidationException {
     if (Objects.nonNull(value) && value.isEmpty()) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/.../java/com/github/nalukit/malio/shared/internal/constraint/ArrayItemNotNullConstraint.java b/.../java/com/github/nalukit/malio/shared/internal/constraint/ArrayItemNotNullConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(T value) {
   public void check(T value)
       throws MalioValidationException {
     if (Objects.isNull(value)) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/ArraySizeConstraint.java b/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/ArraySizeConstraint.java
@@ -99,9 +99,11 @@ public void check(Object[] value)
 
   private void internCheck(int size) {
     if (size < this.min || size > this.max) {
-      throw new MalioValidationException(getMessage(null));
+      throw new MalioValidationException(getMessage(null),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
-
   }
 
   public void isValid(Object[] value,

diff --git a/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/BlacklistConstraint.java b/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/BlacklistConstraint.java
@@ -26,7 +26,7 @@
 public class BlacklistConstraint
     extends AbstractConstraint<String> {
 
-  private List<String> blacklist;
+  private final List<String> blacklist;
 
   public BlacklistConstraint(String packageName,
                              String simpleName,
@@ -44,7 +44,10 @@ public void check(String value)
       throws MalioValidationException {
 
     if (value != null && blacklist.contains(value)) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...om/github/nalukit/malio/shared/internal/constraint/CollectionItemMaxLengthConstraint.java b/...om/github/nalukit/malio/shared/internal/constraint/CollectionItemMaxLengthConstraint.java
@@ -23,7 +23,7 @@
 public class CollectionItemMaxLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int maxLength;
+  private final int maxLength;
 
   public CollectionItemMaxLengthConstraint(String packageName,
                                            String simpleName,
@@ -40,7 +40,10 @@ public CollectionItemMaxLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() > maxLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...om/github/nalukit/malio/shared/internal/constraint/CollectionItemMinLengthConstraint.java b/...om/github/nalukit/malio/shared/internal/constraint/CollectionItemMinLengthConstraint.java
@@ -23,7 +23,7 @@
 public class CollectionItemMinLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int minLength;
+  private final int minLength;
 
   public CollectionItemMinLengthConstraint(String packageName,
                                            String simpleName,
@@ -40,7 +40,10 @@ public CollectionItemMinLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() < minLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...com/github/nalukit/malio/shared/internal/constraint/CollectionItemNotBlankConstraint.java b/...com/github/nalukit/malio/shared/internal/constraint/CollectionItemNotBlankConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(String value) {
   public void check(String value)
       throws MalioValidationException {
     if (Objects.nonNull(value) && value.isEmpty()) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/.../com/github/nalukit/malio/shared/internal/constraint/CollectionItemNotNullConstraint.java b/.../com/github/nalukit/malio/shared/internal/constraint/CollectionItemNotNullConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(T value) {
   public void check(T value)
       throws MalioValidationException {
     if (Objects.isNull(value)) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/EmailConstraint.java b/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/EmailConstraint.java
@@ -46,7 +46,10 @@ protected String getSpecializedMessage(String value) {
   public void check(String value)
       throws MalioValidationException {
     if (Objects.nonNull(value) && !EmailConstraint.regExp.test(value)) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxConstraint.java b/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxConstraint.java
@@ -23,7 +23,7 @@
 public class MaxConstraint
     extends AbstractConstraint<Number> {
 
-  private Long maxValue;
+  private final Long maxValue;
 
   public MaxConstraint(String packageName,
                        String simpleName,
@@ -40,7 +40,10 @@ public MaxConstraint(String packageName,
   public void check(Number value)
       throws MalioValidationException {
     if (value != null && value.longValue() > this.maxValue) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...c/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxDecimalConstraint.java b/...c/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxDecimalConstraint.java
@@ -25,7 +25,7 @@
 public class MaxDecimalConstraint
     extends AbstractConstraint<BigDecimal> {
 
-  private BigDecimal maxValue;
+  private final BigDecimal maxValue;
 
   public MaxDecimalConstraint(String packageName,
                               String simpleName,
@@ -42,7 +42,10 @@ public MaxDecimalConstraint(String packageName,
   public void check(BigDecimal value)
       throws MalioValidationException {
     if (value != null && value.compareTo(this.maxValue) > 0) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxLengthConstraint.java b/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/MaxLengthConstraint.java
@@ -23,7 +23,7 @@
 public class MaxLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int maxLength;
+  private final int maxLength;
 
   public MaxLengthConstraint(String packageName,
                              String simpleName,
@@ -40,7 +40,10 @@ public MaxLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() > maxLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/MinConstraint.java b/malio/src/main/java/com/github/nalukit/malio/shared/internal/constraint/MinConstraint.java
@@ -23,7 +23,7 @@
 public class MinConstraint
     extends AbstractConstraint<Number> {
 
-  private Long minValue;
+  private final Long minValue;
 
   public MinConstraint(String packageName,
                        String simpleName,
@@ -40,7 +40,10 @@ public MinConstraint(String packageName,
   public void check(Number value)
       throws MalioValidationException {
     if (value != null && value.longValue() < this.minValue) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...c/main/java/com/github/nalukit/malio/shared/internal/constraint/MinDecimalConstraint.java b/...c/main/java/com/github/nalukit/malio/shared/internal/constraint/MinDecimalConstraint.java
@@ -25,7 +25,7 @@
 public class MinDecimalConstraint
     extends AbstractConstraint<BigDecimal> {
 
-  private BigDecimal minValue;
+  private final BigDecimal minValue;
 
   public MinDecimalConstraint(String packageName,
                               String simpleName,
@@ -42,7 +42,10 @@ public MinDecimalConstraint(String packageName,
   public void check(BigDecimal value)
       throws MalioValidationException {
     if (value != null && value.compareTo(this.minValue) < 0) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/MinLengthConstraint.java b/...rc/main/java/com/github/nalukit/malio/shared/internal/constraint/MinLengthConstraint.java
@@ -23,7 +23,7 @@
 public class MinLengthConstraint
     extends AbstractConstraint<String> {
 
-  private int minLength;
+  private final int minLength;
 
   public MinLengthConstraint(String packageName,
                              String simpleName,
@@ -40,7 +40,10 @@ public MinLengthConstraint(String packageName,
   public void check(String value)
       throws MalioValidationException {
     if (value != null && value.length() < minLength) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotBlankConstraint.java b/...src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotBlankConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(String value) {
   public void check(String value)
       throws MalioValidationException {
     if (Objects.nonNull(value) && value.isEmpty()) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotEmptyConstraint.java b/...src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotEmptyConstraint.java
@@ -44,7 +44,10 @@ protected String getSpecializedMessage(T value) {
   public void check(T value)
       throws MalioValidationException {
     if (Objects.nonNull(value) && value.isEmpty()) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/.../src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotNullConstraint.java b/.../src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotNullConstraint.java
@@ -43,7 +43,10 @@ protected String getSpecializedMessage(T value) {
   public void check(T value)
       throws MalioValidationException {
     if (Objects.isNull(value)) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/.../src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotZeroConstraint.java b/.../src/main/java/com/github/nalukit/malio/shared/internal/constraint/NotZeroConstraint.java
@@ -25,7 +25,7 @@
 public class NotZeroConstraint
     extends AbstractConstraint<Number> {
 
-  private boolean allowNegativeValues;
+  private final boolean allowNegativeValues;
 
   public NotZeroConstraint(String packageName,
                            String simpleName,
@@ -47,12 +47,18 @@ public void check(Number value)
 
     if (!this.allowNegativeValues) {
       if (value.longValue() < 0) {
-        throw new MalioValidationException(getMessage(value));
+        throw new MalioValidationException(getMessage(value),
+                                           super.getClassName(),
+                                           super.getSimpleName(),
+                                           super.getFieldName());
       }
     }
 
     if (value.longValue() == 0) {
-      throw new MalioValidationException(getMessage(value));
+      throw new MalioValidationException(getMessage(value),
+                                         super.getClassName(),
+                                         super.getSimpleName(),
+                                         super.getFieldName());
     }
   }
 

diff --git a/...o/src/main/java/com/github/nalukit/malio/shared/internal/constraint/RegexpConstraint.java b/...o/src/main/java/com/github/nalukit/malio/shared/internal/constraint/RegexpConstraint.java
@@ -24,7 +24,7 @@
 public class RegexpConstraint
     extends AbstractConstraint<String> {
 
-  private RegExp regExp;
+  private final RegExp regExp;
 
   public RegexpConstraint(String packageName,
                           String simpleName,
@@ -42,7 +42,10 @@ public void check(String value)
       throws MalioValidationException {
     if (value != null) {
       if (!this.regExp.test(value)) {
-        throw new MalioValidationException(getMessage(value));
+        throw new MalioValidationException(getMessage(value),
+                                           super.getClassName(),
+                                           super.getSimpleName(),
+                                           super.getFieldName());
       }
     }
   }