커넥션 옵션 직접 설정하지 않음 (#312)

Co-authored-by: Hank-Choi <[email protected]>
wafflestudio · Jan 7, 2025 · eb7cfca · eb7cfca
1 parent ee70cbf
commit eb7cfca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 
@@ -12,6 +13,7 @@ plugins {
 group = "com.wafflestudio"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
 
 allprojects {
     repositories {
@@ -64,9 +66,9 @@ subprojects {
     }
 
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = "17"
+        compilerOptions {
+            freeCompilerArgs.add("-Xjsr305=strict")
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 

diff --git a/core/src/main/kotlin/config/ApiWebClientConfig.kt b/core/src/main/kotlin/config/ApiWebClientConfig.kt
@@ -1,8 +1,5 @@
 package com.wafflestudio.snu4t.config
 
-import io.netty.channel.ChannelOption
-import io.netty.handler.timeout.ReadTimeoutHandler
-import io.netty.handler.timeout.WriteTimeoutHandler
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
@@ -11,9 +8,8 @@ import org.springframework.context.annotation.Profile
 import org.springframework.http.client.reactive.ReactorClientHttpConnector
 import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.client.WebClient
-import reactor.netty.Connection
 import reactor.netty.http.client.HttpClient
-import java.util.concurrent.TimeUnit
+import java.time.Duration
 
 @Configuration
 @EnableConfigurationProperties(ApiConfigs::class)
@@ -27,16 +23,8 @@ class ApiWebClientConfig(
     }
 
     private fun create(apiConfig: ApiConfig): WebClient {
-        val connector =
-            ReactorClientHttpConnector(
-                HttpClient.create()
-                    .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, apiConfig.connectTimeout) // Connection Timeout
-                    .doOnConnected { conn: Connection ->
-                        conn
-                            .addHandlerLast(ReadTimeoutHandler(apiConfig.readTimeout, TimeUnit.MILLISECONDS))
-                            .addHandlerLast(WriteTimeoutHandler(apiConfig.readTimeout, TimeUnit.MILLISECONDS))
-                    },
-            )
+        val httpClient = HttpClient.create().responseTimeout(Duration.ofMillis(apiConfig.responseTimeout))
+        val connector = ReactorClientHttpConnector(httpClient)
         return WebClient.builder().clientConnector(connector).baseUrl(apiConfig.baseUrl).build()
     }
 }
@@ -48,8 +36,7 @@ class ApiConfigs {
 }
 
 class ApiConfig {
-    var connectTimeout: Int = 800
-    var readTimeout: Long = 1000
+    var responseTimeout: Long = 2000
     lateinit var baseUrl: String
 }