Skip to content

Commit eb1006f

Browse files
committed
Clean up even more API
1 parent 5447fcf commit eb1006f

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConf
8787
}
8888

8989
public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineKt {
90-
public static final fun buildClient (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;Laws/smithy/kotlin/runtime/http/engine/internal/HttpClientMetrics;)Lokhttp3/OkHttpClient;
90+
public static final fun buildClient (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;Laws/smithy/kotlin/runtime/http/engine/internal/HttpClientMetrics;Lokhttp3/ConnectionPool;)Lokhttp3/OkHttpClient;
91+
public static synthetic fun buildClient$default (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;Laws/smithy/kotlin/runtime/http/engine/internal/HttpClientMetrics;Lokhttp3/ConnectionPool;ILjava/lang/Object;)Lokhttp3/OkHttpClient;
9192
}
9293

9394
public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpHeadersAdapter : aws/smithy/kotlin/runtime/http/Headers {

runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ public class OkHttpEngine(
7878
}
7979
}
8080

81-
private fun OkHttpEngineConfig.buildClientFromConfig(
81+
/**
82+
* Convert SDK version of HTTP configuration to OkHttp specific configuration and return the configured client
83+
*/
84+
@InternalApi
85+
public fun OkHttpEngineConfig.buildClient(
8286
metrics: HttpClientMetrics,
8387
poolOverride: ConnectionPool? = null,
8488
): OkHttpClient {
@@ -152,16 +156,6 @@ private fun OkHttpEngineConfig.buildClientFromConfig(
152156
}.build()
153157
}
154158

155-
/**
156-
* Convert SDK version of HTTP configuration to OkHttp specific configuration and return the configured client
157-
*/
158-
// Used by OkHttp4Engine - OkHttp4 does NOT have `connectionListener`
159-
// TODO - Refactor in next minor version - Move this to OkHttp4Engine and make it private
160-
@InternalApi
161-
public fun OkHttpEngineConfig.buildClient(
162-
metrics: HttpClientMetrics,
163-
): OkHttpClient = this.buildClientFromConfig(metrics)
164-
165159
private fun minTlsConnectionSpec(tlsContext: TlsContext): ConnectionSpec {
166160
val minVersion = tlsContext.minVersion ?: TlsVersion.TLS_1_2
167161
val okHttpTlsVersions = SdkTlsVersion

0 commit comments

Comments
 (0)