Merge branch 'main' into fix/#455

woowacourse-teams · Sep 27, 2023 · ccd5c85 · ccd5c85
2 parents b93f92d + 731c673
commit ccd5c85
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 27 deletions.
diff --git a/backend/src/main/java/shook/shook/auth/application/AuthService.java b/backend/src/main/java/shook/shook/auth/application/AuthService.java
@@ -35,7 +35,8 @@ public TokenPair oAuthLogin(final String oauthType, final String authorizationCo
         return new TokenPair(accessToken, refreshToken);
     }
 
-    public ReissueAccessTokenResponse reissueAccessTokenByRefreshToken(final String refreshToken, final String accessToken) {
+    public ReissueAccessTokenResponse reissueAccessTokenByRefreshToken(final String refreshToken,
+                                                                       final String accessToken) {
         final Claims claims = tokenProvider.parseClaims(refreshToken);
         final Long memberId = claims.get("memberId", Long.class);
         final String nickname = claims.get("nickname", String.class);

diff --git a/backend/src/main/java/shook/shook/auth/application/KakaoInfoProvider.java b/backend/src/main/java/shook/shook/auth/application/KakaoInfoProvider.java
@@ -25,7 +25,6 @@ public class KakaoInfoProvider implements OAuthInfoProvider {
     private static final String TOKEN_PREFIX = "Bearer ";
     private static final String GRANT_TYPE = "authorization_code";
 
-
     @Value("${oauth2.kakao.access-token-url}")
     private String KAKAO_ACCESS_TOKEN_URL;
 

diff --git a/backend/src/main/java/shook/shook/auth/application/dto/KakaoMemberInfoResponse.java b/backend/src/main/java/shook/shook/auth/application/dto/KakaoMemberInfoResponse.java
@@ -1,6 +1,5 @@
 package shook.shook.auth.application.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/backend/src/main/java/shook/shook/auth/config/AuthConfig.java b/backend/src/main/java/shook/shook/auth/config/AuthConfig.java
@@ -20,8 +20,8 @@ public class AuthConfig implements WebMvcConfigurer {
     private final TokenInterceptor tokenInterceptor;
 
     public AuthConfig(final AuthArgumentResolver authArgumentResolver,
-        final LoginCheckerInterceptor loginCheckerInterceptor,
-        final TokenInterceptor tokenInterceptor
+                      final LoginCheckerInterceptor loginCheckerInterceptor,
+                      final TokenInterceptor tokenInterceptor
     ) {
         this.authArgumentResolver = authArgumentResolver;
         this.loginCheckerInterceptor = loginCheckerInterceptor;

diff --git a/backend/src/main/java/shook/shook/auth/ui/interceptor/LoginCheckerInterceptor.java b/backend/src/main/java/shook/shook/auth/ui/interceptor/LoginCheckerInterceptor.java
@@ -17,8 +17,9 @@ public LoginCheckerInterceptor(
     }
 
     @Override
-    public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response,
-        final Object handler) throws Exception {
+    public boolean preHandle(final HttpServletRequest request,
+                             final HttpServletResponse response,
+                             final Object handler) throws Exception {
         if (TokenHeaderExtractor.extractToken(request).isEmpty()) {
             return true;
         }

diff --git a/backend/src/main/java/shook/shook/auth/ui/interceptor/PathMatcherInterceptor.java b/backend/src/main/java/shook/shook/auth/ui/interceptor/PathMatcherInterceptor.java
@@ -15,22 +15,23 @@ public PathMatcherInterceptor(final HandlerInterceptor handlerInterceptor) {
     }
 
     @Override
-    public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response,
-        final Object handler) throws Exception {
+    public boolean preHandle(final HttpServletRequest request,
+                             final HttpServletResponse response,
+                             final Object handler) throws Exception {
         if (pathContainer.isNotIncludedPath(request.getServletPath(), request.getMethod())) {
             return true;
         }
         return handlerInterceptor.preHandle(request, response, handler);
     }
 
     public PathMatcherInterceptor includePathPattern(final String requestPathPattern,
-        final PathMethod requestPathMethod) {
+                                                     final PathMethod requestPathMethod) {
         pathContainer.includePathPattern(requestPathPattern, requestPathMethod);
         return this;
     }
 
     public PathMatcherInterceptor excludePathPattern(final String requestPathPattern,
-        final PathMethod requestPathMethod) {
+                                                     final PathMethod requestPathMethod) {
         pathContainer.excludePathPattern(requestPathPattern, requestPathMethod);
         return this;
     }

diff --git a/backend/src/main/java/shook/shook/auth/ui/interceptor/RequestPathPattern.java b/backend/src/main/java/shook/shook/auth/ui/interceptor/RequestPathPattern.java
@@ -12,8 +12,9 @@ public RequestPathPattern(final String path, final PathMethod method) {
         this.method = method;
     }
 
-    public boolean match(final PathMatcher pathMatcher, final String requestPath,
-        final String requestMethod) {
+    public boolean match(final PathMatcher pathMatcher,
+                         final String requestPath,
+                         final String requestMethod) {
         return pathMatcher.match(path, requestPath) && method.match(requestMethod);
     }
 }
diff --git a/backend/src/main/java/shook/shook/member/application/MemberService.java b/backend/src/main/java/shook/shook/member/application/MemberService.java
@@ -78,7 +78,7 @@ private Member findById(final Long id) {
     }
 
     private void validateMemberAuthentication(final Member requestMember,
-        final Member targetMember) {
+                                              final Member targetMember) {
         if (!requestMember.equals(targetMember)) {
             throw new AuthorizationException.UnauthenticatedException(
                 Map.of(

diff --git a/backend/src/main/java/shook/shook/member/domain/Email.java b/backend/src/main/java/shook/shook/member/domain/Email.java
@@ -3,8 +3,6 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

diff --git a/backend/src/main/java/shook/shook/song/application/dto/SongResponse.java b/backend/src/main/java/shook/shook/song/application/dto/SongResponse.java
@@ -58,7 +58,7 @@ public static SongResponse fromUnauthorizedUser(final Song song) {
     }
 
     private static List<KillingPartResponse> toKillingPartResponses(final Song song,
-        final Member member) {
+                                                                    final Member member) {
         final List<KillingPart> songKillingParts = song.getLikeCountSortedKillingParts();
 
         return IntStream.range(0, songKillingParts.size())

diff --git a/...c/main/java/shook/shook/song/domain/killingpart/repository/KillingPartLikeRepository.java b/...c/main/java/shook/shook/song/domain/killingpart/repository/KillingPartLikeRepository.java
@@ -12,7 +12,7 @@
 public interface KillingPartLikeRepository extends JpaRepository<KillingPartLike, Long> {
 
     Optional<KillingPartLike> findByKillingPartAndMember(final KillingPart killingPart,
-        final Member member);
+                                                         final Member member);
 
     List<KillingPartLike> findAllByMemberAndIsDeleted(final Member member, final boolean isDeleted);
 }
diff --git a/backend/src/main/java/shook/shook/voting_song/domain/VotingSongPart.java b/backend/src/main/java/shook/shook/voting_song/domain/VotingSongPart.java
@@ -162,7 +162,6 @@ public int getVoteCount() {
         return votes.size();
     }
 
-
     @Override
     public boolean equals(final Object o) {
         if (this == o) {

diff --git a/backend/src/main/java/shook/shook/voting_song/ui/VotingSongPartController.java b/backend/src/main/java/shook/shook/voting_song/ui/VotingSongPartController.java
@@ -1,6 +1,5 @@
 package shook.shook.voting_song.ui;
 
-
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

diff --git a/backend/src/test/java/shook/shook/ShookApplicationTests.java b/backend/src/test/java/shook/shook/ShookApplicationTests.java
@@ -6,8 +6,8 @@
 @SpringBootTest
 class ShookApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+    @Test
+    void contextLoads() {
+    }
 
 }
diff --git a/backend/src/test/java/shook/shook/auth/application/AuthServiceTest.java b/backend/src/test/java/shook/shook/auth/application/AuthServiceTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 

diff --git a/backend/src/test/java/shook/shook/auth/application/TokenPairSchedulerTest.java b/backend/src/test/java/shook/shook/auth/application/TokenPairSchedulerTest.java
@@ -48,7 +48,8 @@ void renewInMemoryTokenPairRepository() {
         inMemoryTokenPairRepository.addOrUpdateTokenPair(expiredRefreshToken, expiredAccessToken);
 
         // when
-        final TokenPairScheduler tokenPairScheduler = new TokenPairScheduler(tokenProvider, inMemoryTokenPairRepository);
+        final TokenPairScheduler tokenPairScheduler
+            = new TokenPairScheduler(tokenProvider, inMemoryTokenPairRepository);
         tokenPairScheduler.removeExpiredTokenPair();
 
         // then

diff --git a/backend/src/test/java/shook/shook/auth/ui/interceptor/PathMethodTest.java b/backend/src/test/java/shook/shook/auth/ui/interceptor/PathMethodTest.java
@@ -6,7 +6,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-
 class PathMethodTest {
 
     @DisplayName("요청 메소드 이름이 인자로 들어오는 경우 요소의 이름과 비교하여 대소문자 구분없이 같은 true를 반환한다.")

diff --git a/backend/src/test/java/shook/shook/song/domain/InMemorySongsTest.java b/backend/src/test/java/shook/shook/song/domain/InMemorySongsTest.java
@@ -35,7 +35,6 @@ void setUp() {
         inMemorySongs = new InMemorySongs();
     }
 
-
     @DisplayName("InMemorySong 을 1.좋아요 순, 2. id 순으로 정렬된 노래로 초기화한다.")
     @Test
     void recreate() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ void setUp() { @@
             inMemorySongs = new InMemorySongs();
         }
         @DisplayName("InMemorySong 을 1.좋아요 순, 2. id 순으로 정렬된 노래로 초기화한다.")
         @Test
         void recreate() {
@@ Expand Down @@