feat: generate client interfaces and refactor client builder

Author: stainless-bot

README.md

@@ -30,17 +30,18 @@ implementation("com.lithic.api:lithic-java:0.0.0-alpha1")
 
 ### Configure the client
 
-Use `LithicClient.builder()` to configure the client. At a minimum you need to set `.apiKey()`:
+Use `LithicOkHttpClient.builder()` to configure the client. At a minimum you need to set `.apiKey()`:
 
 ```java
-import com.lithic.api.client.okhttp.LithicClient;
+import com.lithic.api.client.LithicClient;
+import com.lithic.api.client.okhttp.LithicOkHttpClient;
 
-LithicClient client = LithicClient.builder()
+LithicClient client = LithicOkHttpClient.builder()
     .apiKey("<your API Key>")
     .build();
 ```
 
-Alternately, set the environment variable `LITHIC_API_KEY` and use `LithicClient.fromEnv()`:
+Alternately, set the environment variable `LITHIC_API_KEY` and use `LithicOkHttpClient.fromEnv()`:
 
 ```java
 LithicClient client = LithicClient.fromEnv();
@@ -56,7 +57,6 @@ To create a new card, first use the `CardCreateParams` builder to specify attrib
 then pass that to the `create` method of the `cards` service.
 
 ```java
-import com.lithic.api.client.okhttp.LithicClient;
 import com.lithic.api.models.Card;
 import com.lithic.api.models.CardCreateParams;
 
@@ -72,7 +72,6 @@ The Lithic API provides a `list` method to get a paginated list of cards.
 You can retrieve the first page by:
 
 ```java
-import com.lithic.api.client.okhttp.LithicClient;
 import com.lithic.api.models.Card;
 import com.lithic.api.models.Page;
 
@@ -270,21 +269,21 @@ Requests that experience certain errors are automatically retried 2 times by def
 You can provide a `maxRetries` on the client builder to configure this:
 
 ```java
-LithicClient client = LithicClient.builder().fromEnv().maxRetries(4).build();
+LithicClient client = LithicOkHttpClient.builder().fromEnv().maxRetries(4).build();
 ```
 
 ### Timeouts
 
 Requests time out after 60 seconds by default. You can configure this on the client builder:
 
 ```java
-LithicClient client = LithicClient.builder().fromEnv().timeout(Duration.ofSeconds(30)).build();
+LithicClient client = LithicOkHttpClient.builder().fromEnv().timeout(Duration.ofSeconds(30)).build();
 ```
 
 ### Environments
 
 Requests are made to the production environment by default. You can connect to other environments, like `sandbox`, via the client builder:
 
 ```java
-LithicClient client = LithicClient.builder().fromEnv().sandbox().build()
+LithicClient client = LithicOkHttpClient.builder().fromEnv().sandbox().build()
 ```

lithic-java-ccore/src/test/kotlin/com/lithic/api/client/LithicClientTest.kt

@@ -0,0 +1,6 @@
+package com.lithic.api.client
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class LithicClientTest

lithic-java-client-okhttp/src/main/kotlin/com/lithic/api/client/okhttp/LithicClient.kt

@@ -0,0 +1,44 @@
+package com.lithic.api.client.okhttp
+
+import com.lithic.api.client.LithicClient
+import com.lithic.api.client.LithicClientImpl
+import com.lithic.api.core.ClientOptions
+import java.time.Duration
+
+class LithicOkHttpClient private constructor() {
+
+    companion object {
+
+        @JvmStatic fun builder() = Builder()
+
+        @JvmStatic fun fromEnv(): LithicClient = builder().fromEnv().build()
+    }
+
+    class Builder {
+
+        private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
+        private var baseUrl: String = ClientOptions.PRODUCTION_URL
+        private var timeout: Duration = Duration.ofSeconds(60)
+        private var maxRetries: Int = 2
+
+        fun sandbox() = apply { baseUrl(ClientOptions.SANDBOX_URL) }
+
+        fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl }
+
+        fun timeout(timeout: Duration) = apply { this.timeout = timeout }
+
+        fun maxRetries(maxRetries: Int) = apply { this.clientOptions.maxRetries(maxRetries) }
+
+        fun apiKey(apiKey: String): Builder = apply { clientOptions.apiKey(apiKey) }
+
+        fun fromEnv(): Builder = apply { clientOptions.fromEnv() }
+
+        fun build(): LithicClient {
+            return LithicClientImpl(
+                clientOptions
+                    .httpClient(OkHttpClient.builder().baseUrl(baseUrl).timeout(timeout).build())
+                    .build()
+            )
+        }
+    }
+}

lithic-java-client-okhttp/src/main/kotlin/com/lithic/api/client/okhttp/LithicClientAsync.kt

@@ -0,0 +1,44 @@
+package com.lithic.api.client.okhttp
+
+import com.lithic.api.client.LithicClientAsync
+import com.lithic.api.client.LithicClientAsyncImpl
+import com.lithic.api.core.ClientOptions
+import java.time.Duration
+
+class LithicOkHttpClientAsync private constructor() {
+
+    companion object {
+
+        @JvmStatic fun builder() = Builder()
+
+        @JvmStatic fun fromEnv(): LithicClientAsync = builder().fromEnv().build()
+    }
+
+    class Builder {
+
+        private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
+        private var baseUrl: String = ClientOptions.PRODUCTION_URL
+        private var timeout: Duration = Duration.ofSeconds(60)
+        private var maxRetries: Int = 2
+
+        fun sandbox() = apply { baseUrl(ClientOptions.SANDBOX_URL) }
+
+        fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl }
+
+        fun timeout(timeout: Duration) = apply { this.timeout = timeout }
+
+        fun maxRetries(maxRetries: Int) = apply { this.clientOptions.maxRetries(maxRetries) }
+
+        fun apiKey(apiKey: String): Builder = apply { clientOptions.apiKey(apiKey) }
+
+        fun fromEnv(): Builder = apply { clientOptions.fromEnv() }
+
+        fun build(): LithicClientAsync {
+            return LithicClientAsyncImpl(
+                clientOptions
+                    .httpClient(OkHttpClient.builder().baseUrl(baseUrl).timeout(timeout).build())
+                    .build()
+            )
+        }
+    }
+}

lithic-java-client-okhttp/src/main/kotlin/com/lithic/api/client/okhttp/LithicOkHttpClient.kt

@@ -11,7 +11,6 @@ dependencies {
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.1")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1")
-    implementation("com.squareup.okhttp3:okhttp:4.10.0")
 
     testImplementation(kotlin("test"))
     testImplementation(project(":lithic-java-client-okhttp"))

lithic-java-client-okhttp/src/main/kotlin/com/lithic/api/client/okhttp/LithicOkHttpClientAsync.kt

@@ -0,0 +1,31 @@
+@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102
+
+package com.lithic.api.client
+
+import com.lithic.api.core.RequestOptions
+import com.lithic.api.models.*
+import com.lithic.api.services.blocking.*
+
+interface LithicClient {
+
+    fun accounts(): AccountService
+
+    fun accountHolders(): AccountHolderService
+
+    fun authRules(): AuthRuleService
+
+    fun authStreamEnrollment(): AuthStreamEnrollmentService
+
+    fun cards(): CardService
+
+    fun fundingSources(): FundingSourceService
+
+    fun transactions(): TransactionService
+
+    /** API status check */
+    @JvmOverloads
+    fun apiStatus(
+        params: ClientApiStatusParams,
+        requestOptions: RequestOptions = RequestOptions.none()
+    ): ApiStatus
+}

lithic-java-client-okhttp/src/test/kotlin/com/lithic/api/client/okhttp/LithicClientAsyncTest.kt

@@ -0,0 +1,32 @@
+@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102
+
+package com.lithic.api.client
+
+import com.lithic.api.core.RequestOptions
+import com.lithic.api.models.*
+import com.lithic.api.services.async.*
+import java.util.concurrent.CompletableFuture
+
+interface LithicClientAsync {
+
+    fun accounts(): AccountServiceAsync
+
+    fun accountHolders(): AccountHolderServiceAsync
+
+    fun authRules(): AuthRuleServiceAsync
+
+    fun authStreamEnrollment(): AuthStreamEnrollmentServiceAsync
+
+    fun cards(): CardServiceAsync
+
+    fun fundingSources(): FundingSourceServiceAsync
+
+    fun transactions(): TransactionServiceAsync
+
+    /** API status check */
+    @JvmOverloads
+    fun apiStatus(
+        params: ClientApiStatusParams,
+        requestOptions: RequestOptions = RequestOptions.none()
+    ): CompletableFuture<ApiStatus>
+}