From bf4c5a57f7d70400308aa02a9610d3dbcbe54ec7 Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 14 Jul 2025 13:57:31 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=82=98=EB=A8=B8=EC=A7=80=20Confi?= =?UTF-8?q?guration=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=BD=94=ED=8B=80?= =?UTF-8?q?=EB=A6=B0=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/common/config/SwaggerConfig.kt | 36 ++++++------- .../roomescape/common/config/WebMvcConfig.kt | 52 +++++++------------ 2 files changed, 38 insertions(+), 50 deletions(-) diff --git a/src/main/java/roomescape/common/config/SwaggerConfig.kt b/src/main/java/roomescape/common/config/SwaggerConfig.kt index 53c72c14..fc251e03 100644 --- a/src/main/java/roomescape/common/config/SwaggerConfig.kt +++ b/src/main/java/roomescape/common/config/SwaggerConfig.kt @@ -1,23 +1,22 @@ -package roomescape.common.config; +package roomescape.common.config -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.info.Info +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration @Configuration -public class SwaggerConfig { +class SwaggerConfig { - @Bean - public OpenAPI openAPI() { - return new OpenAPI().info(apiInfo()); - } + @Bean + fun openAPI(): OpenAPI { + return OpenAPI().info(apiInfo()) + } - private Info apiInfo() { - return new Info() - .title("방탈출 예약 API 문서") - .description(""" + private fun apiInfo(): Info { + return Info() + .title("방탈출 예약 API 문서") + .description(""" ## API 테스트는 '1. 인증 / 인가 API' 의 '/login' 을 통해 로그인 후 사용해주세요. ### 테스트시 로그인 가능한 계정 정보 @@ -70,7 +69,8 @@ public class SwaggerConfig { - 7: 예약은 승인되었으나, 결제 대기 상태 - 8 ~ 10: 예약 대기 상태 - """) - .version("1.0.0"); - } + + """.trimIndent()) + .version("1.0.0") + } } diff --git a/src/main/java/roomescape/common/config/WebMvcConfig.kt b/src/main/java/roomescape/common/config/WebMvcConfig.kt index 4d50a4c1..2e1c2286 100644 --- a/src/main/java/roomescape/common/config/WebMvcConfig.kt +++ b/src/main/java/roomescape/common/config/WebMvcConfig.kt @@ -1,38 +1,26 @@ -package roomescape.common.config; +package roomescape.common.config -import java.util.List; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import roomescape.auth.web.support.AdminInterceptor; -import roomescape.auth.web.support.LoginInterceptor; -import roomescape.auth.web.support.MemberIdResolver; +import org.springframework.context.annotation.Configuration +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.servlet.config.annotation.InterceptorRegistry +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer +import roomescape.auth.web.support.AdminInterceptor +import roomescape.auth.web.support.LoginInterceptor +import roomescape.auth.web.support.MemberIdResolver @Configuration -public class WebMvcConfig implements WebMvcConfigurer { +class WebMvcConfig( + private val memberIdResolver: MemberIdResolver, + private val adminInterceptor: AdminInterceptor, + private val loginInterceptor: LoginInterceptor +) : WebMvcConfigurer { - private final MemberIdResolver memberIdResolver; - private final AdminInterceptor adminInterceptor; - private final LoginInterceptor loginInterceptor; + override fun addArgumentResolvers(resolvers: MutableList) { + resolvers.add(memberIdResolver) + } - public WebMvcConfig(MemberIdResolver memberIdResolver, AdminInterceptor adminInterceptor, - LoginInterceptor loginInterceptor) { - this.memberIdResolver = memberIdResolver; - this.adminInterceptor = adminInterceptor; - this.loginInterceptor = loginInterceptor; - } - - @Override - public void addArgumentResolvers(List resolvers) { - resolvers.add(memberIdResolver); - } - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(adminInterceptor); - registry.addInterceptor(loginInterceptor); - } + override fun addInterceptors(registry: InterceptorRegistry) { + registry.addInterceptor(adminInterceptor) + registry.addInterceptor(loginInterceptor) + } }