From 6ff5181c1ad4f0a25f6024efc239b64068d40112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Tue, 22 Aug 2023 16:47:02 +0900 Subject: [PATCH] =?UTF-8?q?constructor=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MockRouteMgmtController.java | 19 ++++++++------- .../controller/ApiClientController.java | 12 ++++++---- .../controller/ApiRequestMgmtController.java | 6 ++--- .../login/controller/LoginController.java | 2 +- .../controller/ServerMgmtController.java | 16 +++++++------ .../user/controller/AccountController.java | 8 ++++--- .../controller/AdminRegisterController.java | 24 ++++++++++--------- .../user/controller/UserMgmtController.java | 16 +++++++------ .../httpmockserver/user/entity/UserGroup.java | 5 +++- 9 files changed, 61 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java b/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java index d68fe5b..13dccfa 100644 --- a/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java @@ -7,7 +7,6 @@ import com.eactive.httpmockserver.api.entity.MockRoute; import com.eactive.httpmockserver.api.mapper.MockRouteMapper; import com.eactive.httpmockserver.api.service.MockRouteService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Controller; @@ -30,18 +29,20 @@ public class MockRouteMgmtController { mockRouteService.initAllRoutes(); } - @Autowired - private MockRouteService mockRouteService; + private final MockRouteService mockRouteService; - @Autowired - private Validator validator; + private final Validator validator; - @Autowired - private MockRouteMapper mockRouteMapper; + private final MockRouteMapper mockRouteMapper; - @Autowired - private MockApiHandlerMapping mockApiHandlerMapping; + private final MockApiHandlerMapping mockApiHandlerMapping; + public MockRouteMgmtController(MockRouteService mockRouteService, Validator validator, MockRouteMapper mockRouteMapper, MockApiHandlerMapping mockApiHandlerMapping) { + this.mockRouteService = mockRouteService; + this.validator = validator; + this.mockRouteMapper = mockRouteMapper; + this.mockApiHandlerMapping = mockApiHandlerMapping; + } public static final String MOCK_ROUTE_EDIT = "page/routes/mockRouteEdit"; public static final String MOCK_ROUTE_LIST_VIEW = "redirect:/mgmt/routes/list_view.do"; diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java index a427a7a..ae9fbd7 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java +++ b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java @@ -5,7 +5,6 @@ import com.eactive.httpmockserver.client.dto.ApiResponse; import com.eactive.httpmockserver.client.service.NettyApiClient; import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.server.entity.ServerRepository; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; @@ -19,11 +18,14 @@ import java.util.concurrent.ExecutionException; @Controller public class ApiClientController { - @Autowired - private ServerRepository serverRepository; + private final ServerRepository serverRepository; - @Autowired - private NettyApiClient nettyApiClient; + private final NettyApiClient nettyApiClient; + + public ApiClientController(ServerRepository serverRepository, NettyApiClient nettyApiClient) { + this.serverRepository = serverRepository; + this.nettyApiClient = nettyApiClient; + } @PostMapping("/mgmt/api/test.do") @ResponseBody diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java b/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java index f3dd757..9316766 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java +++ b/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java @@ -18,11 +18,11 @@ import java.util.List; public class ApiRequestMgmtController { private static final String SUCCESS = "success"; - ApiRequestMgmtService apiRequestMgmtService; + private final ApiRequestMgmtService apiRequestMgmtService; - ApiRequestMapper apiRequestMapper; + private final ApiRequestMapper apiRequestMapper; - UserService userService; + private final UserService userService; public ApiRequestMgmtController(ApiRequestMgmtService apiRequestMgmtService, ApiRequestMapper apiRequestMapper, UserService userService) { this.apiRequestMgmtService = apiRequestMgmtService; diff --git a/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java b/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java index a925ed3..ce25b5b 100644 --- a/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java +++ b/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java @@ -27,7 +27,7 @@ public class LoginController { public static final String LOGIN_MESSAGE = "loginMessage"; - private UserService userService; + private final UserService userService; public LoginController(UserService userService) { this.userService = userService; diff --git a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java b/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java index b5774ff..be86df8 100644 --- a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java +++ b/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java @@ -6,7 +6,6 @@ import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.server.mapper.ServerMapper; import com.eactive.httpmockserver.server.service.ServerMgmtService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Controller; @@ -22,14 +21,17 @@ import java.util.List; @RequestMapping("/mgmt/servers") public class ServerMgmtController { - @Autowired - ServerMgmtService serverMgmtService; + private final ServerMgmtService serverMgmtService; - @Autowired - ServerMapper serverMapper; + private final ServerMapper serverMapper; - @Autowired - private Validator validator; + private final Validator validator; + + public ServerMgmtController(ServerMgmtService serverMgmtService, ServerMapper serverMapper, Validator validator) { + this.serverMgmtService = serverMgmtService; + this.serverMapper = serverMapper; + this.validator = validator; + } public static final String SERVER = "server"; 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 93ad6c5..6672268 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java +++ b/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java @@ -3,7 +3,6 @@ package com.eactive.httpmockserver.user.controller; import com.eactive.httpmockserver.common.util.SecurityUtil; import com.eactive.httpmockserver.user.dto.PasswordChangeRequestDTO; import com.eactive.httpmockserver.user.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; @@ -17,12 +16,15 @@ import org.springframework.web.bind.annotation.PostMapping; public class AccountController { public static final String UPDATE_PW = "page/updatePw"; - @Autowired private Validator validator; - @Autowired private UserService userService; + public AccountController(Validator validator, UserService userService) { + this.validator = validator; + this.userService = userService; + } + @GetMapping("/change_password.do") public String changePassword( @ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) { return UPDATE_PW; diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java b/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java index 7674e73..4afeded 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java +++ b/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java @@ -5,7 +5,6 @@ import com.eactive.httpmockserver.user.entity.StaffUser; import com.eactive.httpmockserver.user.mapper.StaffUserMapper; import com.eactive.httpmockserver.user.repository.StaffUserRepository; import com.eactive.httpmockserver.user.service.StaffUserService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; @@ -17,27 +16,30 @@ import org.springframework.web.bind.annotation.PostMapping; @Controller public class AdminRegisterController { - @Autowired - StaffUserService staffUserService; + private final StaffUserService staffUserService; - @Autowired - StaffUserRepository staffUserRepository; + private final StaffUserRepository staffUserRepository; - @Autowired - private Validator validator; + private final Validator validator; - @Autowired - private StaffUserMapper staffUserMapper; + private final StaffUserMapper staffUserMapper; + + public AdminRegisterController(StaffUserService staffUserService, StaffUserRepository staffUserRepository, Validator validator, StaffUserMapper staffUserMapper) { + this.staffUserService = staffUserService; + this.staffUserRepository = staffUserRepository; + this.validator = validator; + this.staffUserMapper = staffUserMapper; + } @GetMapping("/admin_register_view.do") public String adminRegisterView(ModelMap model) { long users = staffUserRepository.count(); - if (users == 0){ + if (users == 0) { model.addAttribute("user", new StaffUser()); return "page/users/adminRegister"; - }else { + } else { return "redirect:/"; } } diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java b/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java index f6edd1f..d753b5f 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java +++ b/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java @@ -8,7 +8,6 @@ import com.eactive.httpmockserver.user.entity.StaffUser; import com.eactive.httpmockserver.user.mapper.StaffUserMapper; import com.eactive.httpmockserver.user.service.StaffUserService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Controller; @@ -24,14 +23,17 @@ public class UserMgmtController { public static final String STAFF_USER_EDIT = "page/users/staffUserEdit"; public static final String USERS_LIST_VIEW = "redirect:/mgmt/users/list_view.do"; - @Autowired - private StaffUserService staffUserService; + private final StaffUserService staffUserService; - @Autowired - private Validator validator; + private final Validator validator; - @Autowired - private StaffUserMapper staffUserMapper; + private final StaffUserMapper staffUserMapper; + + public UserMgmtController(StaffUserService staffUserService, Validator validator, StaffUserMapper staffUserMapper) { + this.staffUserService = staffUserService; + this.validator = validator; + this.staffUserMapper = staffUserMapper; + } @GetMapping("/list_view.do") public String userList(@ModelAttribute("userSearch") UserSearch userSearch, diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java b/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java index 632cf04..9941011 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java +++ b/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java @@ -1,11 +1,14 @@ package com.eactive.httpmockserver.user.entity; import javax.persistence.*; +import java.io.Serializable; import java.util.List; @Entity @Table(name = "PT_USER_GROUP") -public class UserGroup { +public class UserGroup implements Serializable { + + private static final long serialVersionUID = 1L; @Id private String id;