fix(client): make some classes and constructors non-public (#169)

chore(internal): remove some unnecessary `constructor` keywords
openai · Jan 26, 2025 · a9e41a4 · a9e41a4
1 parent 1037a09
commit a9e41a4
Show file tree

Hide file tree

Showing 233 changed files with 613 additions and 630 deletions.
diff --git a/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt b/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OkHttpClient.kt
@@ -171,7 +171,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var baseUrl: HttpUrl? = null
         // The default timeout is 10 minutes.

diff --git a/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClient.kt b/openai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClient.kt
@@ -22,7 +22,7 @@ class OpenAIOkHttpClient private constructor() {
         @JvmStatic fun fromEnv(): OpenAIClient = builder().fromEnv().build()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
         private var baseUrl: String = ClientOptions.PRODUCTION_URL

diff --git a/...ai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClientAsync.kt b/...ai-java-client-okhttp/src/main/kotlin/com/openai/client/okhttp/OpenAIOkHttpClientAsync.kt
@@ -22,7 +22,7 @@ class OpenAIOkHttpClientAsync private constructor() {
         @JvmStatic fun fromEnv(): OpenAIClientAsync = builder().fromEnv().build()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var clientOptions: ClientOptions.Builder = ClientOptions.builder()
         private var baseUrl: String = ClientOptions.PRODUCTION_URL

diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientAsyncImpl.kt
@@ -27,8 +27,7 @@ import com.openai.services.async.ModerationServiceAsyncImpl
 import com.openai.services.async.UploadServiceAsync
 import com.openai.services.async.UploadServiceAsyncImpl
 
-class OpenAIClientAsyncImpl
-constructor(
+class OpenAIClientAsyncImpl(
     private val clientOptions: ClientOptions,
 ) : OpenAIClientAsync {
 

diff --git a/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt b/openai-java-core/src/main/kotlin/com/openai/client/OpenAIClientImpl.kt
@@ -27,8 +27,7 @@ import com.openai.services.blocking.ModerationServiceImpl
 import com.openai.services.blocking.UploadService
 import com.openai.services.blocking.UploadServiceImpl
 
-class OpenAIClientImpl
-constructor(
+class OpenAIClientImpl(
     private val clientOptions: ClientOptions,
 ) : OpenAIClient {
 

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt b/openai-java-core/src/main/kotlin/com/openai/core/ClientOptions.kt
@@ -43,7 +43,7 @@ private constructor(
         @JvmStatic fun fromEnv(): ClientOptions = builder().fromEnv().build()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var httpClient: HttpClient? = null
         private var jsonMapper: JsonMapper = jsonMapper()

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/RequestOptions.kt b/openai-java-core/src/main/kotlin/com/openai/core/RequestOptions.kt
@@ -23,7 +23,8 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
+
         private var responseValidation: Boolean? = null
         private var timeout: Duration? = null
 

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/Headers.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/Headers.kt
@@ -22,7 +22,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private val map: MutableMap<String, MutableList<String>> =
             TreeMap(String.CASE_INSENSITIVE_ORDER)

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/HttpRequest.kt
@@ -22,7 +22,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var method: HttpMethod? = null
         private var url: String? = null

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/QueryParams.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/QueryParams.kt
@@ -21,7 +21,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private val map: MutableMap<String, MutableList<String>> = mutableMapOf()
         private var size: Int = 0

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/RetryingHttpClient.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/RetryingHttpClient.kt
@@ -243,7 +243,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var httpClient: HttpClient? = null
         private var clock: Clock = Clock.systemUTC()

diff --git a/openai-java-core/src/main/kotlin/com/openai/core/http/SseMessage.kt b/openai-java-core/src/main/kotlin/com/openai/core/http/SseMessage.kt
@@ -20,7 +20,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var jsonMapper: JsonMapper? = null
         private var event: String? = null

diff --git a/openai-java-core/src/main/kotlin/com/openai/errors/OpenAIError.kt b/openai-java-core/src/main/kotlin/com/openai/errors/OpenAIError.kt
@@ -30,7 +30,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
 

diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Annotation.kt b/openai-java-core/src/main/kotlin/com/openai/models/Annotation.kt
@@ -149,7 +149,7 @@ private constructor(
         }
     }
 
-    class Deserializer : BaseDeserializer<Annotation>(Annotation::class) {
+    internal class Deserializer : BaseDeserializer<Annotation>(Annotation::class) {
 
         override fun ObjectCodec.deserialize(node: JsonNode): Annotation {
             val json = JsonValue.fromJsonNode(node)
@@ -174,7 +174,7 @@ private constructor(
         }
     }
 
-    class Serializer : BaseSerializer<Annotation>(Annotation::class) {
+    internal class Serializer : BaseSerializer<Annotation>(Annotation::class) {
 
         override fun serialize(
             value: Annotation,

diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AnnotationDelta.kt b/openai-java-core/src/main/kotlin/com/openai/models/AnnotationDelta.kt
@@ -150,7 +150,7 @@ private constructor(
         }
     }
 
-    class Deserializer : BaseDeserializer<AnnotationDelta>(AnnotationDelta::class) {
+    internal class Deserializer : BaseDeserializer<AnnotationDelta>(AnnotationDelta::class) {
 
         override fun ObjectCodec.deserialize(node: JsonNode): AnnotationDelta {
             val json = JsonValue.fromJsonNode(node)
@@ -179,7 +179,7 @@ private constructor(
         }
     }
 
-    class Serializer : BaseSerializer<AnnotationDelta>(AnnotationDelta::class) {
+    internal class Serializer : BaseSerializer<AnnotationDelta>(AnnotationDelta::class) {
 
         override fun serialize(
             value: AnnotationDelta,

diff --git a/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt b/openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt
@@ -261,7 +261,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var id: JsonField<String>? = null
         private var createdAt: JsonField<Long>? = null
@@ -754,7 +754,7 @@ private constructor(
             @JvmStatic fun builder() = Builder()
         }
 
-        class Builder {
+        class Builder internal constructor() {
 
             private var codeInterpreter: JsonField<CodeInterpreter> = JsonMissing.of()
             private var fileSearch: JsonField<FileSearch> = JsonMissing.of()
@@ -857,7 +857,7 @@ private constructor(
                 @JvmStatic fun builder() = Builder()
             }
 
-            class Builder {
+            class Builder internal constructor() {
 
                 private var fileIds: JsonField<MutableList<String>>? = null
                 private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
@@ -1001,7 +1001,7 @@ private constructor(
                 @JvmStatic fun builder() = Builder()
             }
 
-            class Builder {
+            class Builder internal constructor() {
 
                 private var vectorStoreIds: JsonField<MutableList<String>>? = null
                 private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantDeleted.kt
@@ -67,7 +67,7 @@ private constructor(
         @JvmStatic fun builder() = Builder()
     }
 
-    class Builder {
+    class Builder internal constructor() {
 
         private var id: JsonField<String>? = null
         private var deleted: JsonField<Boolean>? = null

diff --git a/openai-java-core/src/main/kotlin/com/openai/models/AssistantResponseFormatOption.kt b/openai-java-core/src/main/kotlin/com/openai/models/AssistantResponseFormatOption.kt
@@ -187,7 +187,7 @@ private constructor(
         }
     }
 
-    class Deserializer :
+    internal class Deserializer :
         BaseDeserializer<AssistantResponseFormatOption>(AssistantResponseFormatOption::class) {
 
         override fun ObjectCodec.deserialize(node: JsonNode): AssistantResponseFormatOption {
@@ -226,7 +226,7 @@ private constructor(
         }
     }
 
-    class Serializer :
+    internal class Serializer :
         BaseSerializer<AssistantResponseFormatOption>(AssistantResponseFormatOption::class) {
 
         override fun serialize(