diff --git a/src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java b/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java rename to src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java index bf00325..36f08c5 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java +++ b/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; -public class HttptHandler extends SimpleChannelInboundHandler { +public class HttpHandler extends SimpleChannelInboundHandler { private final CompletableFuture responseFuture; - public HttptHandler(CompletableFuture responseFuture) { + public HttpHandler(CompletableFuture responseFuture) { this.responseFuture = responseFuture; } diff --git a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java index 058e7a8..be928f7 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java +++ b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java @@ -59,7 +59,7 @@ public class NettyApiClient { ch.pipeline().addLast(new HttpClientCodec()); ch.pipeline().addLast(new HttpObjectAggregator(65536)); ch.pipeline().addLast(new HttpContentDecompressor()); - ch.pipeline().addLast(new HttptHandler(responseFuture)); + ch.pipeline().addLast(new HttpHandler(responseFuture)); } }); diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java b/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java index 6672268..a0ef558 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java +++ b/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java @@ -26,7 +26,7 @@ public class AccountController { } @GetMapping("/change_password.do") - public String changePassword( @ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) { + public String changePassword(@ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) { return UPDATE_PW; } @@ -39,18 +39,18 @@ public class AccountController { if (result.hasErrors()) { model.addAttribute("errors", result); - return UPDATE_PW; + } else { + String oldPassword = passwordChangeRequestDTO.getOldPassword(); + String newPassword = passwordChangeRequestDTO.getNewPassword(); + String newPassword2 = passwordChangeRequestDTO.getNewPassword2(); + String resultMsg = userService.updateUserPassword(SecurityUtil.getCurrentUserEsntlId(), oldPassword, newPassword, newPassword2); + + model.addAttribute("resultMsg", resultMsg); + model.addAttribute("passwordChangeRequest", new PasswordChangeRequestDTO()); } - String oldPassword = passwordChangeRequestDTO.getOldPassword(); - String newPassword = passwordChangeRequestDTO.getNewPassword(); - String newPassword2 = passwordChangeRequestDTO.getNewPassword2(); - String resultMsg = userService.updateUserPassword(SecurityUtil.getCurrentUserEsntlId(), oldPassword, newPassword, newPassword2); - model.addAttribute("resultMsg", resultMsg); - model.addAttribute("passwordChangeRequest", new PasswordChangeRequestDTO()); - - return "redirect:/"; + return UPDATE_PW; }