Skip to content

Commit 0d5640f

Browse files
fix(client): don't close client on withOptions usage when original is gc'd
1 parent 03cbcb2 commit 0d5640f

2 files changed

Lines changed: 41 additions & 8 deletions

File tree

lithic-java-core/src/main/kotlin/com/lithic/api/core/ClientOptions.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ private constructor(
100100
webhookSecret = clientOptions.webhookSecret
101101
}
102102

103-
fun httpClient(httpClient: HttpClient) = apply { this.httpClient = httpClient }
103+
fun httpClient(httpClient: HttpClient) = apply {
104+
this.httpClient = PhantomReachableClosingHttpClient(httpClient)
105+
}
104106

105107
fun checkJacksonVersionCompatibility(checkJacksonVersionCompatibility: Boolean) = apply {
106108
this.checkJacksonVersionCompatibility = checkJacksonVersionCompatibility
@@ -258,13 +260,11 @@ private constructor(
258260

259261
return ClientOptions(
260262
httpClient,
261-
PhantomReachableClosingHttpClient(
262-
RetryingHttpClient.builder()
263-
.httpClient(httpClient)
264-
.clock(clock)
265-
.maxRetries(maxRetries)
266-
.build()
267-
),
263+
RetryingHttpClient.builder()
264+
.httpClient(httpClient)
265+
.clock(clock)
266+
.maxRetries(maxRetries)
267+
.build(),
268268
checkJacksonVersionCompatibility,
269269
jsonMapper,
270270
streamHandlerExecutor
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// File generated from our OpenAPI spec by Stainless.
2+
3+
package com.lithic.api.core
4+
5+
import com.lithic.api.core.http.HttpClient
6+
import org.assertj.core.api.Assertions.assertThat
7+
import org.junit.jupiter.api.Test
8+
import org.junit.jupiter.api.extension.ExtendWith
9+
import org.mockito.junit.jupiter.MockitoExtension
10+
import org.mockito.kotlin.mock
11+
import org.mockito.kotlin.never
12+
import org.mockito.kotlin.verify
13+
14+
@ExtendWith(MockitoExtension::class)
15+
internal class ClientOptionsTest {
16+
17+
@Test
18+
fun toBuilder_whenOriginalClientOptionsGarbageCollected_doesNotCloseOriginalClient() {
19+
val httpClient = mock<HttpClient>()
20+
var clientOptions =
21+
ClientOptions.builder().httpClient(httpClient).apiKey("My Lithic API Key").build()
22+
verify(httpClient, never()).close()
23+
24+
// Overwrite the `clientOptions` variable so that the original `ClientOptions` is GC'd.
25+
clientOptions = clientOptions.toBuilder().build()
26+
System.gc()
27+
Thread.sleep(100)
28+
29+
verify(httpClient, never()).close()
30+
// This exists so that `clientOptions` is still reachable.
31+
assertThat(clientOptions).isEqualTo(clientOptions)
32+
}
33+
}

0 commit comments

Comments
 (0)