refactor($muscle-and-fitness-server): enhance validation - @notempty ->

@notblank enhance validation - @notempty -> @notblank BREAKING CHANGE: enhance validation - @notempty -> @notblank [skip ci]
johnnymillergh · Feb 8, 2021 · b4150f1 · b4150f1
1 parent c40c304
commit b4150f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/remoteapi/AuthCenterRemoteApi.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/remoteapi/AuthCenterRemoteApi.java
@@ -19,7 +19,7 @@
 import reactor.core.publisher.Mono;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -104,7 +104,7 @@ public Mono<List<GetPermissionListByRoleIdListResponse.Permission>> getPermissio
      * @return the mono
      */
     @GetMapping("/jwt-remote-api/parse")
-    public Mono<ParseJwtResponse> parse(@NotEmpty String authorization) {
+    public Mono<ParseJwtResponse> parse(@NotBlank String authorization) {
         return webClientBuilder
                 .build()
                 .get()

diff --git a/common/src/main/java/com/jmsoftware/maf/common/domain/ValidationTestPayload.java b/common/src/main/java/com/jmsoftware/maf/common/domain/ValidationTestPayload.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -19,6 +19,6 @@ public class ValidationTestPayload {
     @NotNull
     @Min(value = 1L)
     private Long id;
-    @NotEmpty
+    @NotBlank
     private String name;
 }
diff --git a/common/src/main/java/com/jmsoftware/maf/common/domain/authcenter/user/LoginPayload.java b/common/src/main/java/com/jmsoftware/maf/common/domain/authcenter/user/LoginPayload.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -16,13 +16,13 @@ public class LoginPayload {
     /**
      * The Login token: username / email
      */
-    @NotEmpty
+    @NotBlank
     @Length(max = 100)
     private String loginToken;
     /**
      * The Password.
      */
-    @NotEmpty
+    @NotBlank
     @Length(max = 60)
     private String password;
     /**

diff --git a/...loud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/sftp/SftpUploadFile.java b/...loud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/sftp/SftpUploadFile.java
@@ -4,7 +4,7 @@
 import lombok.Data;
 import org.springframework.integration.file.support.FileExistsMode;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.File;
 
@@ -27,7 +27,7 @@ public class SftpUploadFile {
      * SFTP server's sub directory (if sub directory does'nt exist, will be auto created). Not empty and it looks
      * like this: "/some/sub/directory/"
      */
-    @NotEmpty
+    @NotBlank
     private String subDirectory;
     /**
      * This enumeration indicates what action shall be taken in case the destination file already exists. In default,