chore: upgrade to ktor v3

core/pom.xml

@@ -54,7 +54,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <kotlin.version>2.1.0</kotlin.version>
-        <ktor.version>2.3.13</ktor.version>
+        <ktor.version>3.0.3</ktor.version>
 
         <ktlint-plugin.version>3.3.0</ktlint-plugin.version>
         <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>

core/src/main/kotlin/com/expediagroup/sdk/core/client/Client.kt

@@ -54,7 +54,7 @@ import okhttp3.Dispatcher
 import okhttp3.OkHttpClient
 
 // Create a Dispatcher with limits
-val dispatcher = Dispatcher().apply {
+val configuredDispatcher = Dispatcher().apply {
     maxRequests = 10000 // Maximum number of concurrent requests
     maxRequestsPerHost = 1000
 }
@@ -63,7 +63,7 @@ val DEFAULT_HTTP_CLIENT_ENGINE: HttpClientEngine =
     OkHttp.create {
         config {
             eventListenerFactory(OkHttpEventListener.FACTORY)
-            dispatcher(dispatcher)
+            dispatcher(configuredDispatcher)
         }
     }
 

core/src/main/kotlin/com/expediagroup/sdk/core/client/ExpediaGroupClient.kt

@@ -67,4 +67,20 @@ abstract class ExpediaGroupClient(
             return self()
         }
     }
+
+    @Suppress("unused", "UnnecessaryAbstractClass") // This is used by the generated SDK clients.
+    abstract class BuilderWithHttpClient<SELF : Client.BuilderWithHttpClient<SELF>> : Client.BuilderWithHttpClient<SELF>() {
+        /** Sets the API auth endpoint to use for requests. */
+        protected var authEndpoint: String? = null
+
+        /** Sets the API auth endpoint to use for requests.
+         *
+         * @param authEndpoint The API auth endpoint to use for requests.
+         * @return The [Builder] instance.
+         */
+        fun authEndpoint(authEndpoint: String): SELF {
+            this.authEndpoint = authEndpoint
+            return self()
+        }
+    }
 }

core/src/main/kotlin/com/expediagroup/sdk/core/configuration/provider/XapConfigurationProvider.kt

@@ -15,11 +15,6 @@
  */
 package com.expediagroup.sdk.core.configuration.provider
 
-import com.expediagroup.sdk.core.configuration.provider.RapidConfigurationProvider.connectionTimeout
-import com.expediagroup.sdk.core.configuration.provider.RapidConfigurationProvider.endpoint
-import com.expediagroup.sdk.core.configuration.provider.RapidConfigurationProvider.name
-import com.expediagroup.sdk.core.configuration.provider.RapidConfigurationProvider.requestTimeout
-import com.expediagroup.sdk.core.configuration.provider.RapidConfigurationProvider.socketTimeout
 import com.expediagroup.sdk.core.constant.Constant
 
 /**

core/src/main/kotlin/com/expediagroup/sdk/core/constant/Constant.kt

@@ -15,13 +15,13 @@
  */
 package com.expediagroup.sdk.core.constant
 
-import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.HttpTimeoutConfig
 
 internal object Constant {
     const val EMPTY_STRING = ""
     const val TEN_SECONDS_IN_MILLIS = 10_000L
     const val FIFTEEN_SECONDS_IN_MILLIS = 15_000L
-    const val INFINITE_TIMEOUT = HttpTimeout.INFINITE_TIMEOUT_MS
+    const val INFINITE_TIMEOUT = HttpTimeoutConfig.INFINITE_TIMEOUT_MS
 
     private const val SUCCESSFUL_STATUS_CODES_RANGE_START = 200
     private const val SUCCESSFUL_STATUS_CODES_RANGE_END = 299

core/src/main/kotlin/com/expediagroup/sdk/core/constant/LogMaskingRegex.kt

@@ -15,8 +15,10 @@
  */
 package com.expediagroup.sdk.core.constant
 
+import com.expediagroup.sdk.core.constant.LoggingMessage.OMITTED
+
 internal object LogMaskingRegex {
     val FIELD_REGEX = "^[a-zA-Z0-9-_]+$".toRegex()
 
-    val NUMBER_FIELD_REGEX = "(?<=[\"']?number[\"']?:\\s?[\"'])(\\s*\\d{15,16}\\s*)(?=[\"'])".toRegex()
+    const val REPLACEMENT_TEMPLATE = "\"$1$2${OMITTED}\""
 }

core/src/main/kotlin/com/expediagroup/sdk/core/constant/provider/LogMaskingRegexProvider.kt

@@ -16,5 +16,13 @@
 package com.expediagroup.sdk.core.constant.provider
 
 internal object LogMaskingRegexProvider {
-    fun getMaskedFieldsRegex(maskedBodyFields: Set<String>) = "(?<=[\"']?(${maskedBodyFields.joinToString("|")})[\"']?:\\s?[\"'])(\\s*[^\"']+\\s*)(?=[\"'])".toRegex()
+    fun getMaskedFieldsRegex(maskedBodyFields: Set<String>, value: String = "[^\\\"]+"): Regex {
+        val fields = maskedBodyFields.joinToString("|")
+        return "\"(${fields})(\\\\*\"\\s*:\\s*\\\\*\")${value}(?:\\\\?\"|)".toRegex()
+    }
+
+    fun getMaskedFieldsRegex(maskedBodyField: String, value: String = "[^\\\"]+"): Regex {
+        val fields = setOf(maskedBodyField)
+        return getMaskedFieldsRegex(fields, value)
+    }
 }

core/src/main/kotlin/com/expediagroup/sdk/core/model/paging/ResponseState.kt

@@ -16,17 +16,10 @@
 package com.expediagroup.sdk.core.model.paging
 
 import com.expediagroup.sdk.core.client.Client
-import com.expediagroup.sdk.core.constant.HeaderValue
 import com.expediagroup.sdk.core.model.Response
-import com.expediagroup.sdk.core.plugin.logging.GZipEncoder.decode
-import com.expediagroup.sdk.core.plugin.logging.contentEncoding
 import io.ktor.client.statement.HttpResponse
-import io.ktor.util.InternalAPI
-import io.ktor.util.moveToByteArray
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.bits.Memory
+import io.ktor.client.statement.bodyAsBytes
 import kotlinx.coroutines.runBlocking
-import java.nio.ByteBuffer
 
 internal interface ResponseState<T> {
     fun getNextResponse(): Response<T>
@@ -75,23 +68,9 @@ internal class FetchLinkState<T>(
     }
 
     private suspend fun parseBody(response: HttpResponse): T {
-        return if (decodeBody(response).isEmpty()) fallbackBody else getBody(response)
-    }
-
-    private suspend fun decodeBody(response: HttpResponse): String {
-        val byteReadChannel = prepareByteReadChannel(response)
-        val decodedByteReadChannel = if (response.contentEncoding().equals(HeaderValue.GZIP)) client.httpClient.decode(byteReadChannel) else byteReadChannel
-        val bodyString: String = decodedByteReadChannel.readRemaining().readText()
-        return bodyString
-    }
-
-    @OptIn(InternalAPI::class)
-    private suspend fun prepareByteReadChannel(response: HttpResponse): ByteReadChannel {
-        val bufferSize = response.content.availableForRead
-        val buffer = ByteBuffer.allocate(bufferSize)
-        val numberOfBytesRead = response.content.peekTo(Memory(buffer), 0, 0, 0, bufferSize.toLong()).toInt()
-        val byteReadChannel = ByteReadChannel(buffer.moveToByteArray(), 0, numberOfBytesRead)
-        return byteReadChannel
+        // response.bodyAsBytes() applies all plugins
+        // if content-length header is set, response.contentLength could be used instead
+        return if (response.bodyAsBytes().isEmpty()) fallbackBody else getBody(response)
     }
 }
 

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/authentication/strategy/AuthenticationStrategy.kt

@@ -20,11 +20,11 @@ import com.expediagroup.sdk.core.plugin.authentication.AuthenticationConfigurati
 import com.expediagroup.sdk.core.plugin.authentication.strategy.AuthenticationStrategy.AuthenticationType.BASIC
 import com.expediagroup.sdk.core.plugin.authentication.strategy.AuthenticationStrategy.AuthenticationType.BEARER
 import com.expediagroup.sdk.core.plugin.authentication.strategy.AuthenticationStrategy.AuthenticationType.SIGNATURE
-import io.ktor.client.plugins.auth.Auth
+import io.ktor.client.plugins.auth.AuthConfig
 import io.ktor.client.request.HttpRequestBuilder
 
 internal interface AuthenticationStrategy {
-    fun loadAuth(auth: Auth) {}
+    fun loadAuth(auth: AuthConfig) {}
 
     fun isTokenAboutToExpire(): Boolean
 

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/authentication/strategy/BasicAuthenticationStrategy.kt

@@ -17,15 +17,16 @@ package com.expediagroup.sdk.core.plugin.authentication.strategy
 
 import com.expediagroup.sdk.core.plugin.authentication.AuthenticationConfiguration
 import io.ktor.client.plugins.auth.Auth
+import io.ktor.client.plugins.auth.AuthConfig
 import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
 import io.ktor.client.plugins.auth.providers.basic
 import io.ktor.client.request.HttpRequestBuilder
 
 internal class BasicAuthenticationStrategy(
     private val configs: AuthenticationConfiguration
 ) : AuthenticationStrategy {
-    override fun loadAuth(auth: Auth) {
-        auth.basic {
+    override fun loadAuth(authConfig: AuthConfig) {
+        authConfig.basic {
             sendWithoutRequest { true }
             credentials {
                 BasicAuthCredentials(username = configs.credentials.key, password = configs.credentials.secret)

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/authentication/strategy/ExpediaGroupAuthenticationStrategy.kt

@@ -28,11 +28,11 @@ import com.expediagroup.sdk.core.plugin.authentication.AuthenticationConfigurati
 import com.expediagroup.sdk.core.plugin.logging.ExpediaGroupLoggerFactory
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.plugins.auth.Auth
+import io.ktor.client.plugins.auth.AuthConfig
+import io.ktor.client.plugins.auth.authProviders
 import io.ktor.client.plugins.auth.providers.BearerAuthProvider
 import io.ktor.client.plugins.auth.providers.BearerTokens
 import io.ktor.client.plugins.auth.providers.bearer
-import io.ktor.client.plugins.plugin
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.basicAuth
 import io.ktor.client.request.parameter
@@ -53,8 +53,8 @@ internal class ExpediaGroupAuthenticationStrategy(
     private val log = ExpediaGroupLoggerFactory.getLogger(javaClass)
     private var bearerTokenStorage = BearerTokensInfo.emptyBearerTokenInfo
 
-    override fun loadAuth(auth: Auth) {
-        auth.bearer {
+    override fun loadAuth(authConfig: AuthConfig) {
+        authConfig.bearer {
             sendWithoutRequest { request ->
                 isIdentityRequest(request)
             }
@@ -94,7 +94,7 @@ internal class ExpediaGroupAuthenticationStrategy(
 
     private fun clearTokens(client: HttpClient) {
         log.info(LoggingMessage.TOKEN_CLEARING_IN_PROGRESS)
-        client.plugin(Auth).providers.filterIsInstance<BearerAuthProvider>().first().clearToken()
+        client.authProviders.filterIsInstance<BearerAuthProvider>().first().clearToken()
         bearerTokenStorage = BearerTokensInfo.emptyBearerTokenInfo
         log.info(LoggingMessage.TOKEN_CLEARING_SUCCESSFUL)
     }

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/ExpediaGroupLogger.kt

@@ -22,8 +22,6 @@ import org.slf4j.Logger
 
 internal class ExpediaGroupLogger(private val logger: Logger, private val client: Client? = null) : Logger by logger {
 
-    private val mask = LogMasker(getMaskedBodyFieldFilters())
-
     override fun info(msg: String) {
         if (logger.isInfoEnabled) {
             logger.info(decorate(msg))
@@ -42,11 +40,7 @@ internal class ExpediaGroupLogger(private val logger: Logger, private val client
         }
     }
 
-    private fun decorate(msg: String): String = "$LOGGING_PREFIX ${mask(msg)}"
+    private fun decorate(msg: String): String = "$LOGGING_PREFIX ${mask(msg, getMaskedBodyFields())}"
 
     private fun getMaskedBodyFields(): Set<String> = client?.getLoggingMaskedFieldsProvider()?.getMaskedBodyFields() ?: LogMaskingFields.DEFAULT_MASKED_BODY_FIELDS
-
-    private fun getMaskedBodyFieldFilters(): Iterable<ExpediaGroupJsonFieldFilter> = listOf(
-        ExpediaGroupJsonFieldFilter(getMaskedBodyFields().toTypedArray()),
-    )
 }

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/LogMasker.kt

@@ -15,18 +15,24 @@
  */
 package com.expediagroup.sdk.core.plugin.logging
 
-import com.ebay.ejmask.core.BaseFilter
-import com.ebay.ejmask.core.EJMask
-import com.ebay.ejmask.core.EJMaskInitializer
-import com.ebay.ejmask.core.util.LoggerUtil
+import com.expediagroup.sdk.core.constant.LogMaskingRegex.REPLACEMENT_TEMPLATE
+import com.expediagroup.sdk.core.constant.provider.LogMaskingRegexProvider
 
-internal class LogMasker(
-    filters: Iterable<BaseFilter>
-) : (String) -> String {
-    init {
-        LoggerUtil.register { _, _, _ -> /* disable logging */ }
-        filters.forEach { EJMaskInitializer.addFilter(it) }
-    }
+internal fun mask(
+    message: String,
+    maskedBodyFields: Set<String>
+): String {
+    val masks: List<Mask> =
+        listOf(
+            Mask { LogMaskingRegexProvider.getMaskedFieldsRegex(maskedBodyFields) },
+            Mask { LogMaskingRegexProvider.getMaskedFieldsRegex("number", "\\d{12,19}")}
+        )
 
-    override fun invoke(message: String): String = EJMask.mask(message)
+    return masks.fold(message) { acc, mask -> mask.mask(acc) }
+}
+
+internal fun interface Mask {
+    fun getRegex(): Regex
+
+    fun mask(string: String) = string.replace(this.getRegex(), REPLACEMENT_TEMPLATE)
 }

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/LoggingConfiguration.kt

@@ -26,7 +26,7 @@ internal data class LoggingConfiguration(
     override val httpClientConfiguration: HttpClientConfig<out HttpClientEngineConfig>,
     val maskedLoggingHeaders: Set<String>,
     val maskedLoggingBodyFields: Set<String>,
-    val level: LogLevel = LogLevel.HEADERS,
+    val level: LogLevel = LogLevel.ALL,
     val getLogger: (client: Client) -> Logger = createCustomLogger
 ) : KtorPluginConfiguration(httpClientConfiguration) {
     companion object {

core/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/LoggingPlugin.kt

@@ -41,8 +41,6 @@ internal object LoggingPlugin : Plugin<LoggingConfiguration> {
                 client.getLoggingMaskedFieldsProvider().getMaskedHeaderFields().contains(header)
             }
         }
-        configurations.httpClientConfiguration.install(RequestBodyLogger)
-        configurations.httpClientConfiguration.install(ResponseBodyLogger)
     }
 }