From fd9f0e0cea6eee84c80ea36a6a1f41d783e71f16 Mon Sep 17 00:00:00 2001 From: pricelees Date: Tue, 15 Jul 2025 11:54:29 +0900 Subject: [PATCH] style: code reformat & remove unused imports --- src/main/java/roomescape/auth/service/AuthService.kt | 4 ++-- src/main/java/roomescape/auth/web/AuthController.kt | 4 ++-- .../roomescape/auth/web/support/AuthInterceptors.kt | 6 +++--- .../java/roomescape/member/business/MemberService.kt | 4 ++-- .../roomescape/payment/client/TossPaymentClient.java | 4 ++-- src/main/java/roomescape/payment/domain/Payment.java | 2 +- .../roomescape/payment/service/PaymentService.java | 4 ++-- .../controller/ReservationController.java | 12 ++++++------ .../controller/ReservationTimeController.java | 8 ++++---- .../roomescape/reservation/domain/Reservation.java | 2 +- .../dto/request/ReservationTimeRequest.java | 2 +- .../reservation/service/ReservationService.java | 4 ++-- .../reservation/service/ReservationTimeService.java | 4 ++-- .../roomescape/theme/controller/ThemeController.java | 2 +- .../java/roomescape/theme/service/ThemeService.java | 6 ++---- 15 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/main/java/roomescape/auth/service/AuthService.kt b/src/main/java/roomescape/auth/service/AuthService.kt index a5f50636..ccc9c95c 100644 --- a/src/main/java/roomescape/auth/service/AuthService.kt +++ b/src/main/java/roomescape/auth/service/AuthService.kt @@ -1,12 +1,12 @@ package roomescape.auth.service import org.springframework.stereotype.Service -import roomescape.member.business.MemberService -import roomescape.member.infrastructure.persistence.Member import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.auth.web.LoginCheckResponse import roomescape.auth.web.LoginRequest import roomescape.auth.web.TokenResponse +import roomescape.member.business.MemberService +import roomescape.member.infrastructure.persistence.Member @Service class AuthService( diff --git a/src/main/java/roomescape/auth/web/AuthController.kt b/src/main/java/roomescape/auth/web/AuthController.kt index d9f00349..6866437d 100644 --- a/src/main/java/roomescape/auth/web/AuthController.kt +++ b/src/main/java/roomescape/auth/web/AuthController.kt @@ -42,6 +42,6 @@ class AuthController( @PostMapping("/logout") override fun logout(): ResponseEntity> = ResponseEntity.ok() - .header(HttpHeaders.SET_COOKIE, expiredAccessTokenCookie()) - .body(CommonApiResponse()) + .header(HttpHeaders.SET_COOKIE, expiredAccessTokenCookie()) + .body(CommonApiResponse()) } diff --git a/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt b/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt index 869f734e..f63f4645 100644 --- a/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt +++ b/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt @@ -6,11 +6,11 @@ import org.springframework.http.HttpStatus import org.springframework.stereotype.Component import org.springframework.web.method.HandlerMethod import org.springframework.web.servlet.HandlerInterceptor -import roomescape.member.business.MemberService -import roomescape.member.infrastructure.persistence.Member import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomescapeException +import roomescape.member.business.MemberService +import roomescape.member.infrastructure.persistence.Member private fun Any.isIrrelevantWith(annotationType: Class): Boolean { if (this !is HandlerMethod) { @@ -40,7 +40,7 @@ class LoginInterceptor( val memberId: Long = jwtHandler.getMemberIdFromToken(token) return memberService.existsById(memberId) - } catch (e: RoomescapeException) { + } catch (_: RoomescapeException) { response.sendRedirect("/login") throw RoomescapeException(ErrorType.LOGIN_REQUIRED, HttpStatus.FORBIDDEN) } diff --git a/src/main/java/roomescape/member/business/MemberService.kt b/src/main/java/roomescape/member/business/MemberService.kt index 6ac50940..6dc20c7c 100644 --- a/src/main/java/roomescape/member/business/MemberService.kt +++ b/src/main/java/roomescape/member/business/MemberService.kt @@ -4,12 +4,12 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomescapeException import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.member.web.MembersResponse import roomescape.member.web.toResponse -import roomescape.common.exception.ErrorType -import roomescape.common.exception.RoomescapeException @Service @Transactional(readOnly = true) diff --git a/src/main/java/roomescape/payment/client/TossPaymentClient.java b/src/main/java/roomescape/payment/client/TossPaymentClient.java index 8245760f..9ba7c8bc 100644 --- a/src/main/java/roomescape/payment/client/TossPaymentClient.java +++ b/src/main/java/roomescape/payment/client/TossPaymentClient.java @@ -14,13 +14,13 @@ import org.springframework.web.client.RestClient; import com.fasterxml.jackson.databind.ObjectMapper; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomescapeException; import roomescape.payment.dto.request.PaymentCancelRequest; import roomescape.payment.dto.request.PaymentRequest; import roomescape.payment.dto.response.PaymentCancelResponse; import roomescape.payment.dto.response.PaymentResponse; import roomescape.payment.dto.response.TossPaymentErrorResponse; -import roomescape.common.exception.ErrorType; -import roomescape.common.exception.RoomescapeException; @Component public class TossPaymentClient { diff --git a/src/main/java/roomescape/payment/domain/Payment.java b/src/main/java/roomescape/payment/domain/Payment.java index 1ead5b25..42094431 100644 --- a/src/main/java/roomescape/payment/domain/Payment.java +++ b/src/main/java/roomescape/payment/domain/Payment.java @@ -12,9 +12,9 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import roomescape.reservation.domain.Reservation; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; +import roomescape.reservation.domain.Reservation; @Entity public class Payment { diff --git a/src/main/java/roomescape/payment/service/PaymentService.java b/src/main/java/roomescape/payment/service/PaymentService.java index 9bf28730..e4761559 100644 --- a/src/main/java/roomescape/payment/service/PaymentService.java +++ b/src/main/java/roomescape/payment/service/PaymentService.java @@ -7,6 +7,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomescapeException; import roomescape.payment.domain.CanceledPayment; import roomescape.payment.domain.Payment; import roomescape.payment.domain.repository.CanceledPaymentRepository; @@ -16,8 +18,6 @@ import roomescape.payment.dto.response.PaymentCancelResponse; import roomescape.payment.dto.response.PaymentResponse; import roomescape.payment.dto.response.ReservationPaymentResponse; import roomescape.reservation.domain.Reservation; -import roomescape.common.exception.ErrorType; -import roomescape.common.exception.RoomescapeException; @Service @Transactional diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java index 25f79104..89dcb95a 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationController.java @@ -24,6 +24,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import roomescape.auth.web.support.Admin; +import roomescape.auth.web.support.LoginRequired; +import roomescape.auth.web.support.MemberId; +import roomescape.common.dto.response.RoomescapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; +import roomescape.common.exception.RoomescapeException; import roomescape.payment.client.TossPaymentClient; import roomescape.payment.dto.request.PaymentCancelRequest; import roomescape.payment.dto.request.PaymentRequest; @@ -37,12 +43,6 @@ import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.dto.response.ReservationsResponse; import roomescape.reservation.service.ReservationService; import roomescape.reservation.service.ReservationWithPaymentService; -import roomescape.auth.web.support.Admin; -import roomescape.auth.web.support.LoginRequired; -import roomescape.auth.web.support.MemberId; -import roomescape.common.dto.response.RoomescapeErrorResponse; -import roomescape.common.dto.response.RoomescapeApiResponse; -import roomescape.common.exception.RoomescapeException; @RestController @Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java index c70aa217..18d5abb5 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java @@ -23,15 +23,15 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import roomescape.auth.web.support.Admin; +import roomescape.auth.web.support.LoginRequired; +import roomescape.common.dto.response.RoomescapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.dto.response.ReservationTimesResponse; import roomescape.reservation.service.ReservationTimeService; -import roomescape.auth.web.support.Admin; -import roomescape.auth.web.support.LoginRequired; -import roomescape.common.dto.response.RoomescapeErrorResponse; -import roomescape.common.dto.response.RoomescapeApiResponse; @RestController @Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/domain/Reservation.java b/src/main/java/roomescape/reservation/domain/Reservation.java index 2c393643..228f5b04 100644 --- a/src/main/java/roomescape/reservation/domain/Reservation.java +++ b/src/main/java/roomescape/reservation/domain/Reservation.java @@ -15,9 +15,9 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import roomescape.member.infrastructure.persistence.Member; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; +import roomescape.member.infrastructure.persistence.Member; import roomescape.theme.domain.Theme; @Entity diff --git a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java b/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java index a01433ed..dd2f24c5 100644 --- a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java +++ b/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java @@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus; import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import roomescape.reservation.domain.ReservationTime; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; +import roomescape.reservation.domain.ReservationTime; @Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.") public record ReservationTimeRequest( diff --git a/src/main/java/roomescape/reservation/service/ReservationService.java b/src/main/java/roomescape/reservation/service/ReservationService.java index 9f0301ba..5b8c4efd 100644 --- a/src/main/java/roomescape/reservation/service/ReservationService.java +++ b/src/main/java/roomescape/reservation/service/ReservationService.java @@ -9,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomescapeException; import roomescape.member.business.MemberService; import roomescape.member.infrastructure.persistence.Member; import roomescape.reservation.domain.Reservation; @@ -22,8 +24,6 @@ import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.dto.response.MyReservationsResponse; import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.dto.response.ReservationsResponse; -import roomescape.common.exception.ErrorType; -import roomescape.common.exception.RoomescapeException; import roomescape.theme.domain.Theme; import roomescape.theme.service.ThemeService; diff --git a/src/main/java/roomescape/reservation/service/ReservationTimeService.java b/src/main/java/roomescape/reservation/service/ReservationTimeService.java index 5ea06332..276a0daa 100644 --- a/src/main/java/roomescape/reservation/service/ReservationTimeService.java +++ b/src/main/java/roomescape/reservation/service/ReservationTimeService.java @@ -7,6 +7,8 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomescapeException; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.domain.repository.ReservationRepository; @@ -16,8 +18,6 @@ import roomescape.reservation.dto.response.ReservationTimeInfoResponse; import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.dto.response.ReservationTimesResponse; -import roomescape.common.exception.ErrorType; -import roomescape.common.exception.RoomescapeException; @Service @Transactional diff --git a/src/main/java/roomescape/theme/controller/ThemeController.java b/src/main/java/roomescape/theme/controller/ThemeController.java index e40b459f..224190d5 100644 --- a/src/main/java/roomescape/theme/controller/ThemeController.java +++ b/src/main/java/roomescape/theme/controller/ThemeController.java @@ -23,8 +23,8 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import roomescape.auth.web.support.Admin; import roomescape.auth.web.support.LoginRequired; -import roomescape.common.dto.response.RoomescapeErrorResponse; import roomescape.common.dto.response.RoomescapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; import roomescape.theme.dto.ThemeRequest; import roomescape.theme.dto.ThemeResponse; import roomescape.theme.dto.ThemesResponse; diff --git a/src/main/java/roomescape/theme/service/ThemeService.java b/src/main/java/roomescape/theme/service/ThemeService.java index c9874dfd..aabc2790 100644 --- a/src/main/java/roomescape/theme/service/ThemeService.java +++ b/src/main/java/roomescape/theme/service/ThemeService.java @@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; +import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; import roomescape.theme.dto.ThemeRequest; @@ -21,11 +21,9 @@ import roomescape.theme.dto.ThemesResponse; public class ThemeService { private final ThemeRepository themeRepository; - private final ReservationRepository reservationRepository; - public ThemeService(ThemeRepository themeRepository, ReservationRepository reservationRepository) { + public ThemeService(ThemeRepository themeRepository) { this.themeRepository = themeRepository; - this.reservationRepository = reservationRepository; } @Transactional(readOnly = true)