♻️ refactor: refactor codebase #2

sivaosorg · Sep 3, 2024 · dd1311a · dd1311a
1 parent 04e8820
commit dd1311a
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 2 deletions.
diff --git a/plugin/src/main/groovy/org/clarify4j/common/annotation/IsEmail.java b/plugin/src/main/groovy/org/clarify4j/common/annotation/IsEmail.java
@@ -0,0 +1,21 @@
+package org.clarify4j.common.annotation;
+
+import org.clarify4j.config.validator.EmailValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = EmailValidator.class)
+@Documented
+public @interface IsEmail {
+    String message() default "Invalid email";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    boolean disabled() default false;
+}
diff --git a/plugin/src/main/groovy/org/clarify4j/config/validator/EmailValidator.java b/plugin/src/main/groovy/org/clarify4j/config/validator/EmailValidator.java
@@ -0,0 +1,29 @@
+package org.clarify4j.config.validator;
+
+import org.clarify4j.common.annotation.IsEmail;
+import org.unify4j.common.Regex4j;
+import org.unify4j.common.String4j;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class EmailValidator implements ConstraintValidator<IsEmail, String> {
+    protected boolean disabled;
+
+    @Override
+    public void initialize(IsEmail url) {
+        this.disabled = url.disabled();
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        if (this.disabled) {
+            return true;
+        }
+        if (String4j.isEmpty(value)) {
+            return false;
+        }
+        return Regex4j.isEmail(value);
+    }
+}
+
diff --git a/plugin/src/main/groovy/org/clarify4j/config/validator/IPValidator.java b/plugin/src/main/groovy/org/clarify4j/config/validator/IPValidator.java
@@ -2,6 +2,7 @@
 
 import org.clarify4j.common.annotation.IsIP;
 import org.unify4j.common.Regex4j;
+import org.unify4j.common.String4j;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -19,6 +20,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (this.disabled) {
             return true;
         }
+        if (String4j.isEmpty(value)) {
+            return false;
+        }
         return Regex4j.isIp(value);
     }
 }
diff --git a/plugin/src/main/groovy/org/clarify4j/config/validator/NumericValidator.java b/plugin/src/main/groovy/org/clarify4j/config/validator/NumericValidator.java
@@ -20,6 +20,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (this.disabled) {
             return true;
         }
+        if (String4j.isEmpty(value)) {
+            return false;
+        }
         return String4j.isNumeric(value) && Regex4j.isNumeric(value);
     }
 }
diff --git a/plugin/src/main/groovy/org/clarify4j/config/validator/TimeValidator.java b/plugin/src/main/groovy/org/clarify4j/config/validator/TimeValidator.java
@@ -2,6 +2,7 @@
 
 import org.clarify4j.common.annotation.IsTime;
 import org.unify4j.common.Regex4j;
+import org.unify4j.common.String4j;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -19,6 +20,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
         if (this.disabled) {
             return true;
         }
+        if (String4j.isEmpty(value)) {
+            return false;
+        }
         return Regex4j.isTime24HFully(value) && Regex4j.isTime12HFully(value);
     }
 }

diff --git a/plugin/src/main/groovy/org/clarify4j/config/validator/UrlValidator.java b/plugin/src/main/groovy/org/clarify4j/config/validator/UrlValidator.java
@@ -2,6 +2,7 @@
 
 import org.clarify4j.common.annotation.IsUrl;
 import org.unify4j.common.Regex4j;
+import org.unify4j.common.String4j;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -15,10 +16,13 @@ public void initialize(IsUrl url) {
     }
 
     @Override
-    public boolean isValid(String url, ConstraintValidatorContext context) {
+    public boolean isValid(String value, ConstraintValidatorContext context) {
         if (this.disabled) {
             return true;
         }
-        return Regex4j.isURL(url);
+        if (String4j.isEmpty(value)) {
+            return false;
+        }
+        return Regex4j.isURL(value);
     }
 }