clean readme file

Author: PouyaPouryaie

README.md

@@ -122,9 +122,9 @@ hikari.dataSource.password="ENC({output})"
 ~~~
 
 ### Jobs Run Tool
-1 - define class implement Runnable in order to execute job base on schedule 
-2 - define bean (AlertServiceJob) in BeanConfig class for your jobs
-3 - define trigger time in properties ```(ex: app.jobs.alertServiceJob=0 */1 * ? * *)``` file
-4 - @EnableScheduling on SpringApp
+1) define class implement Runnable in order to execute job base on schedule 
+2) define bean (AlertServiceJob) in BeanConfig class for your jobs
+3) define trigger time in properties ```(ex: app.jobs.alertServiceJob=0 */1 * ? * *)``` file
+4) @EnableScheduling on SpringApp
 
 notice: that name of bean in BeanConfig must be equal with name of key in properties file.

src/main/java/ir/bigz/springbootreal/validation/ValidationHandler.java

@@ -4,6 +4,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class ValidationHandler {
@@ -14,22 +15,31 @@ public ValidationHandler(@Qualifier("ValidationUtilsImpl") ValidationUtils valid
         this.validationUtils = validationUtils;
     }
 
-    public boolean apply(ValidationType validation, List<String> allowed, Object value) {
+    public boolean apply(ValidationType validation, List<String> allowed, Object value, boolean nullOption) {
 
         boolean pass = false;
-        switch (validation) {
-            case EMAIL:
-                pass = validationUtils.isEmailValid(value.toString());
-                break;
-            case GENDER:
-                pass = validationUtils.isGenderValid(value.toString(), allowed);
-                break;
-            case NATIONAL_CODE:
-                pass = validationUtils.isNationalCodeValid(value.toString());
-                break;
-            case MOBILE:
-                pass = validationUtils.isMobileValid(value.toString());
-                break;
+
+        if(nullOption && Objects.isNull(value)){
+            return true;
+        }
+        else if(!nullOption && Objects.isNull(value)){
+            return false;
+        }
+        else{
+            switch (validation) {
+                case EMAIL:
+                    pass = validationUtils.isEmailValid((String) value);
+                    break;
+                case GENDER:
+                    pass = validationUtils.isGenderValid((String) value, allowed);
+                    break;
+                case NATIONAL_CODE:
+                    pass = validationUtils.isNationalCodeValid((String) value);
+                    break;
+                case MOBILE:
+                    pass = validationUtils.isMobileValid((String) value);
+                    break;
+            }
         }
 
         return pass;

src/main/java/ir/bigz/springbootreal/validation/ValidationValidator.java

@@ -12,18 +12,18 @@
 @Service
 public class ValidationValidator implements ConstraintValidator<Validator, String> {
 
+    boolean nullOption;
     List<String> allowed;
     ValidationType validationsType;
-
     private final ValidationHandler validationHandler;
-
     public ValidationValidator(ValidationHandler validationHandler) {
         this.validationHandler = validationHandler;
     }
 
     @Override
     public void initialize(Validator constraintAnnotation) {
         validationsType = constraintAnnotation.value();
+        nullOption = constraintAnnotation.nullOption();
         if(constraintAnnotation.allowed().length > 0){
             allowed = Arrays.asList(constraintAnnotation.allowed());
         }
@@ -38,7 +38,7 @@ else if(validationsType.getDefaultValue().length > 0){
     @Override
     public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
 
-        if(!validationHandler.apply(validationsType, allowed, value)){
+        if(!validationHandler.apply(validationsType, allowed, value, nullOption)){
             constraintValidatorContext.disableDefaultConstraintViolation();
             constraintValidatorContext.buildConstraintViolationWithTemplate(validationsType.getFailedMessage())
                     .addConstraintViolation();

src/main/java/ir/bigz/springbootreal/validation/annotation/Validator.java

@@ -19,5 +19,6 @@
     Class<?>[] groups() default {};
     Class<? extends Payload>[] payload() default {};
     String[] allowed() default {};
+    boolean nullOption() default false;
     ValidationType value();
 }

src/main/java/ir/bigz/springbootreal/viewmodel/UserModel.java

@@ -17,19 +17,17 @@ public class UserModel extends BaseModel implements Serializable {
     private String userName;
 
     @NotBlank(message = "national code must not blank")
-    @Validator(ValidationType.NATIONAL_CODE)
+    @Validator(value = ValidationType.NATIONAL_CODE)
     private String nationalCode;
 
-    @NotBlank(message = "mobile must not blank")
-    @Validator(ValidationType.MOBILE)
+    @Validator(value = ValidationType.MOBILE, nullOption = true)
     private String mobile;
 
-    @NotBlank(message = "email must not blank")
-    @Validator(ValidationType.EMAIL)
+    @Validator(value = ValidationType.EMAIL, nullOption = true)
     private String email;
 
     @NotBlank(message = "gender must not blank")
-    @Validator(ValidationType.GENDER)
+    @Validator(value = ValidationType.GENDER)
     private String gender;
 
     public UserModel() {
@@ -44,8 +42,8 @@ public UserModel(Long id,
                      @NotBlank(message = "lastName must not blank") String lastName,
                      @NotBlank(message = "userName must not blank") String userName,
                      @Validator(ValidationType.NATIONAL_CODE) String nationalCode,
-                     @Validator(ValidationType.MOBILE) String mobile,
-                     @Validator(ValidationType.EMAIL) String email,
+                     @Validator(value = ValidationType.MOBILE, nullOption = true) String mobile,
+                     @Validator(value = ValidationType.EMAIL, nullOption = true) String email,
                      @Validator(ValidationType.GENDER) String gender) {
         super(id, version, insertDate, updateDate, activeStatus);
         this.firstName = firstName;