From 3f5bb61227c54d6f23f1dabcd420a4ef8773e4e4 Mon Sep 17 00:00:00 2001 From: Rebwon Date: Wed, 15 Sep 2021 16:21:49 +0900 Subject: [PATCH] Refactor code - remove unnecessary code - moving package --- .../{presentation => infrastructure}/LoginAccount.java | 5 +---- .../LoginAccountMethodArgumentResolver.java | 3 +-- .../{presentation => infrastructure}/WebConfiguration.java | 2 +- .../com/yam/app/account/presentation/AccountQueryApi.java | 3 +-- .../yam/app/account/integration/AccountIntegrationTests.java | 4 ++-- 5 files changed, 6 insertions(+), 11 deletions(-) rename src/main/java/com/yam/app/account/{presentation => infrastructure}/LoginAccount.java (64%) rename src/main/java/com/yam/app/account/{presentation => infrastructure}/LoginAccountMethodArgumentResolver.java (92%) rename src/main/java/com/yam/app/account/{presentation => infrastructure}/WebConfiguration.java (91%) diff --git a/src/main/java/com/yam/app/account/presentation/LoginAccount.java b/src/main/java/com/yam/app/account/infrastructure/LoginAccount.java similarity index 64% rename from src/main/java/com/yam/app/account/presentation/LoginAccount.java rename to src/main/java/com/yam/app/account/infrastructure/LoginAccount.java index 368f1d5..0fe2e01 100644 --- a/src/main/java/com/yam/app/account/presentation/LoginAccount.java +++ b/src/main/java/com/yam/app/account/infrastructure/LoginAccount.java @@ -1,13 +1,10 @@ -package com.yam.app.account.presentation; +package com.yam.app.account.infrastructure; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * 현재 로그인 되어있는 사용자의 세션 AccountPrincipal 객체를 반환합니다. - */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface LoginAccount { diff --git a/src/main/java/com/yam/app/account/presentation/LoginAccountMethodArgumentResolver.java b/src/main/java/com/yam/app/account/infrastructure/LoginAccountMethodArgumentResolver.java similarity index 92% rename from src/main/java/com/yam/app/account/presentation/LoginAccountMethodArgumentResolver.java rename to src/main/java/com/yam/app/account/infrastructure/LoginAccountMethodArgumentResolver.java index 391c1f0..d9cb597 100644 --- a/src/main/java/com/yam/app/account/presentation/LoginAccountMethodArgumentResolver.java +++ b/src/main/java/com/yam/app/account/infrastructure/LoginAccountMethodArgumentResolver.java @@ -1,6 +1,5 @@ -package com.yam.app.account.presentation; +package com.yam.app.account.infrastructure; -import com.yam.app.account.infrastructure.SessionManager; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.springframework.core.MethodParameter; diff --git a/src/main/java/com/yam/app/account/presentation/WebConfiguration.java b/src/main/java/com/yam/app/account/infrastructure/WebConfiguration.java similarity index 91% rename from src/main/java/com/yam/app/account/presentation/WebConfiguration.java rename to src/main/java/com/yam/app/account/infrastructure/WebConfiguration.java index a3a6349..90c4f31 100644 --- a/src/main/java/com/yam/app/account/presentation/WebConfiguration.java +++ b/src/main/java/com/yam/app/account/infrastructure/WebConfiguration.java @@ -1,4 +1,4 @@ -package com.yam.app.account.presentation; +package com.yam.app.account.infrastructure; import java.util.List; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java b/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java index 773fa8a..51ec4e5 100644 --- a/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java +++ b/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java @@ -2,8 +2,8 @@ package com.yam.app.account.presentation; import com.yam.app.account.application.AccountFacade; import com.yam.app.account.infrastructure.AccountPrincipal; +import com.yam.app.account.infrastructure.LoginAccount; import javax.validation.Valid; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Slf4j @RestController @RequestMapping( produces = MediaType.APPLICATION_JSON_VALUE, diff --git a/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java b/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java index 53ddc1c..230ba4c 100644 --- a/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java +++ b/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java @@ -108,8 +108,8 @@ final class AccountIntegrationTests { void authentication_member_find_info_success() throws Exception { //Arrange var session = new MockHttpSession(); - session.setAttribute(SessionManager.LOGIN_ACCOUNT, - new AccountPrincipal("loginCheck@gmail.com")); + var sessionManager = new SessionManager(session); + sessionManager.setPrincipal(new AccountPrincipal("loginCheck@gmail.com")); //Act final var actions = mockMvc.perform(get(FIND_INFO)