Refactor user param

src/main/java/run/halo/app/controller/admin/api/UserController.java

@@ -5,7 +5,9 @@ import run.halo.app.model.dto.UserDTO;
 import run.halo.app.model.entity.User;
 import run.halo.app.model.params.PasswordParam;
 import run.halo.app.model.params.UserParam;
+import run.halo.app.model.support.UpdateCheck;
 import run.halo.app.service.UserService;
+import run.halo.app.utils.ValidationUtils;
 
 import javax.validation.Valid;
 
@@ -25,13 +27,16 @@ public class UserController {
         this.userService = userService;
     }
 
-    @GetMapping("profile")
+    @GetMapping("profiles")
     public UserDTO getProfile(User user) {
         return new UserDTO().convertFrom(user);
     }
 
-    @PutMapping("profile")
+    @PutMapping("profiles")
-    public UserDTO updateProfile(@Valid @RequestBody UserParam userParam, User user) {
+    public UserDTO updateProfile(@RequestBody UserParam userParam, User user) {
+        // Validate the user param
+        ValidationUtils.validate(userParam, UpdateCheck.class);
+
         // Update properties
         userParam.update(user);
 
@@ -39,8 +44,8 @@ public class UserController {
         return new UserDTO().convertFrom(userService.update(user));
     }
 
-    @PutMapping("profile/password")
+    @PutMapping("profiles/password")
-    public void updatePassword(@Valid @RequestBody PasswordParam passwordParam, User user) {
+    public void updatePassword(@RequestBody @Valid PasswordParam passwordParam, User user) {
         userService.updatePassword(passwordParam.getOldPassword(), passwordParam.getNewPassword(), user.getId());
     }
 }

src/main/java/run/halo/app/controller/content/api/InstallController.java

@@ -1,4 +1,4 @@
-package run.halo.app.controller.admin.api;
+package run.halo.app.controller.content.api;
 
 import freemarker.template.Configuration;
 import lombok.extern.slf4j.Slf4j;
@@ -147,7 +147,7 @@ public class InstallController {
     }
 
     private User createDefaultUser(InstallParam installParam) {
-        return userService.createBy(installParam, installParam.getPassword());
+        return userService.createBy(installParam);
     }
 
     private void initSettings(InstallParam installParam) {

src/main/java/run/halo/app/listener/StartedListener.java

@@ -10,10 +10,12 @@ import run.halo.app.config.properties.HaloProperties;
 import run.halo.app.model.entity.User;
 import run.halo.app.model.params.UserParam;
 import run.halo.app.model.properties.PrimaryProperties;
+import run.halo.app.model.support.CreateCheck;
 import run.halo.app.service.OptionService;
 import run.halo.app.service.ThemeService;
 import run.halo.app.service.UserService;
 import run.halo.app.utils.FileUtils;
+import run.halo.app.utils.ValidationUtils;
 
 import java.net.URI;
 import java.nio.file.*;
@@ -66,10 +68,14 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
             userParam.setUsername("test");
             userParam.setNickname("developer");
             userParam.setEmail("test@test.com");
+            userParam.setPassword("opentest");
 
             log.debug("Initializing a test user: [{}]", userParam);
 
-            User testUser = userService.createBy(userParam, "opentest");
+            // Validate the user param
+            ValidationUtils.validate(userParam, CreateCheck.class);
+
+            User testUser = userService.createBy(userParam);
 
             log.debug("Initialized a test user: [{}]", testUser);
         }

src/main/java/run/halo/app/model/params/InstallParam.java

@@ -31,13 +31,6 @@ public class InstallParam extends UserParam {
     /**
      * Blog url.
      */
-    @NotBlank(message = "Blog url must not be blank")
     private String url;
 
-    /**
-     * Password.
-     */
-    @NotBlank(message = "Password must not be blank")
-    @Size(max = 100, message = "Length of password must not be more than {max}")
-    private String password;
 }

src/main/java/run/halo/app/model/params/UserParam.java

@@ -1,11 +1,15 @@
 package run.halo.app.model.params;
 
+import lombok.Data;
 import run.halo.app.model.dto.base.InputConverter;
 import run.halo.app.model.entity.User;
-import lombok.Data;
+import run.halo.app.model.support.AllCheck;
+import run.halo.app.model.support.CreateCheck;
+import run.halo.app.model.support.UpdateCheck;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Null;
 import javax.validation.constraints.Size;
 
 /**
@@ -17,22 +21,27 @@ import javax.validation.constraints.Size;
 @Data
 public class UserParam implements InputConverter<User> {
 
-    @NotBlank(message = "Username must not be blank")
+    @NotBlank(message = "Username must not be blank", groups = {AllCheck.class})
-    @Size(max = 50, message = "Length of username must not be more than {max}")
+    @Size(max = 50, message = "Length of username must not be more than {max}", groups = {AllCheck.class})
     private String username;
 
-    @NotBlank(message = "Nickname must not be blank")
+    @NotBlank(message = "Nickname must not be blank", groups = {AllCheck.class})
-    @Size(max = 255, message = "Length of nickname must not be more than {max}")
+    @Size(max = 255, message = "Length of nickname must not be more than {max}", groups = {AllCheck.class})
     private String nickname;
 
-    @Email(message = "The email format is incorrect")
+    @Email(message = "The email format is incorrect", groups = {AllCheck.class})
-    @NotBlank(message = "Email must not be blank")
+    @NotBlank(message = "Email must not be blank", groups = {AllCheck.class})
-    @Size(max = 127, message = "Length of email must not be more than {max}")
+    @Size(max = 127, message = "Length of email must not be more than {max}", groups = {AllCheck.class})
     private String email;
 
-    @Size(max = 1023, message = "Length of avatar link must not be more than {max}")
+    @Null(groups = UpdateCheck.class)
+    @Size(min = 8, max = 100, message = "Length of password must be between {min} and {max}", groups = {CreateCheck.class})
+    private String password;
+
+    @Size(max = 1023, message = "Length of avatar link must not be more than {max}", groups = {AllCheck.class})
     private String avatar;
 
-    @Size(max = 1023, message = "Length of description must not be more than {max}")
+    @Size(max = 1023, message = "Length of description must not be more than {max}", groups = {AllCheck.class})
     private String description;
+
 }

src/main/java/run/halo/app/model/support/AllCheck.java

@@ -0,0 +1,13 @@
+package run.halo.app.model.support;
+
+import javax.validation.GroupSequence;
+
+/**
+ * All check for hibernate validation.
+ *
+ * @author johnniang
+ * @date 19-4-28
+ */
+@GroupSequence({CreateCheck.class, UpdateCheck.class})
+public interface AllCheck {
+}

src/main/java/run/halo/app/model/support/CreateCheck.java

@@ -0,0 +1,10 @@
+package run.halo.app.model.support;
+
+/**
+ * Create check for hibernate validation
+ *
+ * @author johnniang
+ * @date 19-4-28
+ */
+public interface CreateCheck {
+}

src/main/java/run/halo/app/model/support/UpdateCheck.java

@@ -0,0 +1,10 @@
+package run.halo.app.model.support;
+
+/**
+ * Update check for hibernate validation
+ *
+ * @author johnniang
+ * @date 19-4-28
+ */
+public interface UpdateCheck {
+}

src/main/java/run/halo/app/service/UserService.java

@@ -103,9 +103,8 @@ public interface UserService extends CrudService<User, Integer> {
      * Creates an user.
      *
      * @param userParam user param must not be null.
-     * @param password  password must not be blank
      * @return created user
      */
     @NonNull
-    User createBy(@NonNull UserParam userParam, @NonNull String password);
+    User createBy(@NonNull UserParam userParam);
 }

src/main/java/run/halo/app/service/impl/UserServiceImpl.java

@@ -180,7 +180,7 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
         }
 
         // Set new password
-        setPassword(newPassword, user);
+        setPassword(user, newPassword);
 
         // Update this user
         User updatedUser = update(user);
@@ -192,13 +192,12 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
     }
 
     @Override
-    public User createBy(UserParam userParam, String password) {
+    public User createBy(UserParam userParam) {
         Assert.notNull(userParam, "User param must not be null");
-        Assert.hasText(password, "Password must not be blank");
 
         User user = userParam.convertTo();
 
-        setPassword(password, user);
+        setPassword(user, userParam.getPassword());
 
         return create(user);
     }
@@ -213,9 +212,9 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
         return updatedUser;
     }
 
-    private void setPassword(@NonNull String plainPassword, @NonNull User user) {
+    private void setPassword(@NonNull User user, @NonNull String plainPassword) {
-        Assert.hasText(plainPassword, "Plain password must not be blank");
         Assert.notNull(user, "User must not be null");
+        Assert.hasText(plainPassword, "Plain password must not be blank");
 
         user.setPassword(BCrypt.hashpw(plainPassword, BCrypt.gensalt()));
     }