chore: rebuild project due to codegen change

braintrust-java-client-okhttp/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
 dependencies {
     api(project(":braintrust-java-core"))
 
-    implementation("com.google.guava:guava:33.0.0-jre")
     implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
     testImplementation(kotlin("test"))

braintrust-java-client-okhttp/src/main/kotlin/com/braintrustdata/api/client/okhttp/BraintrustOkHttpClient.kt

@@ -5,6 +5,8 @@ package com.braintrustdata.api.client.okhttp
 import com.braintrustdata.api.client.BraintrustClient
 import com.braintrustdata.api.client.BraintrustClientImpl
 import com.braintrustdata.api.core.ClientOptions
+import com.braintrustdata.api.core.http.Headers
+import com.braintrustdata.api.core.http.QueryParams
 import com.fasterxml.jackson.databind.json.JsonMapper
 import java.net.Proxy
 import java.time.Clock
@@ -36,6 +38,8 @@ class BraintrustOkHttpClient private constructor() {
 
         fun clock(clock: Clock) = apply { clientOptions.clock(clock) }
 
+        fun headers(headers: Headers) = apply { clientOptions.headers(headers) }
+
         fun headers(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.headers(headers)
         }
@@ -46,6 +50,8 @@ class BraintrustOkHttpClient private constructor() {
             clientOptions.putHeaders(name, values)
         }
 
+        fun putAllHeaders(headers: Headers) = apply { clientOptions.putAllHeaders(headers) }
+
         fun putAllHeaders(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.putAllHeaders(headers)
         }
@@ -58,6 +64,8 @@ class BraintrustOkHttpClient private constructor() {
             clientOptions.replaceHeaders(name, values)
         }
 
+        fun replaceAllHeaders(headers: Headers) = apply { clientOptions.replaceAllHeaders(headers) }
+
         fun replaceAllHeaders(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.replaceAllHeaders(headers)
         }
@@ -66,6 +74,8 @@ class BraintrustOkHttpClient private constructor() {
 
         fun removeAllHeaders(names: Set<String>) = apply { clientOptions.removeAllHeaders(names) }
 
+        fun queryParams(queryParams: QueryParams) = apply { clientOptions.queryParams(queryParams) }
+
         fun queryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.queryParams(queryParams)
         }
@@ -78,6 +88,10 @@ class BraintrustOkHttpClient private constructor() {
             clientOptions.putQueryParams(key, values)
         }
 
+        fun putAllQueryParams(queryParams: QueryParams) = apply {
+            clientOptions.putAllQueryParams(queryParams)
+        }
+
         fun putAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.putAllQueryParams(queryParams)
         }
@@ -90,6 +104,10 @@ class BraintrustOkHttpClient private constructor() {
             clientOptions.replaceQueryParams(key, values)
         }
 
+        fun replaceAllQueryParams(queryParams: QueryParams) = apply {
+            clientOptions.replaceAllQueryParams(queryParams)
+        }
+
         fun replaceAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.replaceAllQueryParams(queryParams)
         }

braintrust-java-client-okhttp/src/main/kotlin/com/braintrustdata/api/client/okhttp/BraintrustOkHttpClientAsync.kt

@@ -5,6 +5,8 @@ package com.braintrustdata.api.client.okhttp
 import com.braintrustdata.api.client.BraintrustClientAsync
 import com.braintrustdata.api.client.BraintrustClientAsyncImpl
 import com.braintrustdata.api.core.ClientOptions
+import com.braintrustdata.api.core.http.Headers
+import com.braintrustdata.api.core.http.QueryParams
 import com.fasterxml.jackson.databind.json.JsonMapper
 import java.net.Proxy
 import java.time.Clock
@@ -36,6 +38,8 @@ class BraintrustOkHttpClientAsync private constructor() {
 
         fun clock(clock: Clock) = apply { clientOptions.clock(clock) }
 
+        fun headers(headers: Headers) = apply { clientOptions.headers(headers) }
+
         fun headers(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.headers(headers)
         }
@@ -46,6 +50,8 @@ class BraintrustOkHttpClientAsync private constructor() {
             clientOptions.putHeaders(name, values)
         }
 
+        fun putAllHeaders(headers: Headers) = apply { clientOptions.putAllHeaders(headers) }
+
         fun putAllHeaders(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.putAllHeaders(headers)
         }
@@ -58,6 +64,8 @@ class BraintrustOkHttpClientAsync private constructor() {
             clientOptions.replaceHeaders(name, values)
         }
 
+        fun replaceAllHeaders(headers: Headers) = apply { clientOptions.replaceAllHeaders(headers) }
+
         fun replaceAllHeaders(headers: Map<String, Iterable<String>>) = apply {
             clientOptions.replaceAllHeaders(headers)
         }
@@ -66,6 +74,8 @@ class BraintrustOkHttpClientAsync private constructor() {
 
         fun removeAllHeaders(names: Set<String>) = apply { clientOptions.removeAllHeaders(names) }
 
+        fun queryParams(queryParams: QueryParams) = apply { clientOptions.queryParams(queryParams) }
+
         fun queryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.queryParams(queryParams)
         }
@@ -78,6 +88,10 @@ class BraintrustOkHttpClientAsync private constructor() {
             clientOptions.putQueryParams(key, values)
         }
 
+        fun putAllQueryParams(queryParams: QueryParams) = apply {
+            clientOptions.putAllQueryParams(queryParams)
+        }
+
         fun putAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.putAllQueryParams(queryParams)
         }
@@ -90,6 +104,10 @@ class BraintrustOkHttpClientAsync private constructor() {
             clientOptions.replaceQueryParams(key, values)
         }
 
+        fun replaceAllQueryParams(queryParams: QueryParams) = apply {
+            clientOptions.replaceAllQueryParams(queryParams)
+        }
+
         fun replaceAllQueryParams(queryParams: Map<String, Iterable<String>>) = apply {
             clientOptions.replaceAllQueryParams(queryParams)
         }

braintrust-java-client-okhttp/src/main/kotlin/com/braintrustdata/api/client/okhttp/OkHttpClient.kt

@@ -1,22 +1,20 @@
 package com.braintrustdata.api.client.okhttp
 
 import com.braintrustdata.api.core.RequestOptions
+import com.braintrustdata.api.core.http.Headers
 import com.braintrustdata.api.core.http.HttpClient
 import com.braintrustdata.api.core.http.HttpMethod
 import com.braintrustdata.api.core.http.HttpRequest
 import com.braintrustdata.api.core.http.HttpRequestBody
 import com.braintrustdata.api.core.http.HttpResponse
 import com.braintrustdata.api.errors.BraintrustIoException
-import com.google.common.collect.ListMultimap
-import com.google.common.collect.MultimapBuilder
 import java.io.IOException
 import java.io.InputStream
 import java.net.Proxy
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType
@@ -95,7 +93,9 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
         }
 
         val builder = Request.Builder().url(toUrl()).method(method.name, body)
-        headers.forEach(builder::header)
+        headers.names().forEach { name ->
+            headers.values(name).forEach { builder.header(name, it) }
+        }
 
         return builder.build()
     }
@@ -107,7 +107,9 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
 
         val builder = baseUrl.newBuilder()
         pathSegments.forEach(builder::addPathSegment)
-        queryParams.forEach(builder::addQueryParameter)
+        queryParams.keys().forEach { key ->
+            queryParams.values(key).forEach { builder.addQueryParameter(key, it) }
+        }
 
         return builder.toString()
     }
@@ -133,21 +135,18 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
         return object : HttpResponse {
             override fun statusCode(): Int = code
 
-            override fun headers(): ListMultimap<String, String> = headers
+            override fun headers(): Headers = headers
 
             override fun body(): InputStream = body!!.byteStream()
 
             override fun close() = body!!.close()
         }
     }
 
-    private fun Headers.toHeaders(): ListMultimap<String, String> {
-        val headers =
-            MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER)
-                .arrayListValues()
-                .build<String, String>()
-        forEach { pair -> headers.put(pair.first, pair.second) }
-        return headers
+    private fun okhttp3.Headers.toHeaders(): Headers {
+        val headersBuilder = Headers.builder()
+        forEach { (name, value) -> headersBuilder.put(name, value) }
+        return headersBuilder.build()
     }
 
     companion object {

braintrust-java-core/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
 dependencies {
     api("com.fasterxml.jackson.core:jackson-core:2.14.3")
     api("com.fasterxml.jackson.core:jackson-databind:2.14.3")
-    api("com.google.guava:guava:33.0.0-jre")
 
     implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.3")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.3")

braintrust-java-core/src/main/kotlin/com/braintrustdata/api/client/BraintrustClientAsyncImpl.kt

@@ -13,7 +13,7 @@ constructor(
 ) : BraintrustClientAsync {
 
     private val clientOptionsWithUserAgent =
-        if (clientOptions.headers.containsKey("User-Agent")) clientOptions
+        if (clientOptions.headers.names().contains("User-Agent")) clientOptions
         else
             clientOptions
                 .toBuilder()

braintrust-java-core/src/main/kotlin/com/braintrustdata/api/client/BraintrustClientImpl.kt

@@ -13,7 +13,7 @@ constructor(
 ) : BraintrustClient {
 
     private val clientOptionsWithUserAgent =
-        if (clientOptions.headers.containsKey("User-Agent")) clientOptions
+        if (clientOptions.headers.names().contains("User-Agent")) clientOptions
         else
             clientOptions
                 .toBuilder()