Skip to content

Commit 6ddc67e

Browse files
stainless-app[bot]stainless-bot
stainless-app[bot]
authored and
stainless-bot
committed
style(internal): reorder some params methods and improve consistency of implementations (#15)
1 parent ad81119 commit 6ddc67e

24 files changed

+610
-603
lines changed

‎openai-java-core/src/main/kotlin/com/openai/models/BatchCancelParams.kt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ constructor(
2121

2222
fun batchId(): String = batchId
2323

24+
fun _additionalHeaders(): Headers = additionalHeaders
25+
26+
fun _additionalQueryParams(): QueryParams = additionalQueryParams
27+
28+
fun _additionalBodyProperties(): Map<String, JsonValue> = additionalBodyProperties
29+
2430
@JvmSynthetic
2531
internal fun getBody(): Optional<Map<String, JsonValue>> {
2632
return Optional.ofNullable(additionalBodyProperties.ifEmpty { null })
@@ -37,25 +43,6 @@ constructor(
3743
}
3844
}
3945

40-
fun _additionalHeaders(): Headers = additionalHeaders
41-
42-
fun _additionalQueryParams(): QueryParams = additionalQueryParams
43-
44-
fun _additionalBodyProperties(): Map<String, JsonValue> = additionalBodyProperties
45-
46-
override fun equals(other: Any?): Boolean {
47-
if (this === other) {
48-
return true
49-
}
50-
51-
return /* spotless:off */ other is BatchCancelParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
52-
}
53-
54-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
55-
56-
override fun toString() =
57-
"BatchCancelParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
58-
5946
fun toBuilder() = Builder().from(this)
6047

6148
companion object {
@@ -73,10 +60,10 @@ constructor(
7360

7461
@JvmSynthetic
7562
internal fun from(batchCancelParams: BatchCancelParams) = apply {
76-
this.batchId = batchCancelParams.batchId
77-
additionalHeaders(batchCancelParams.additionalHeaders)
78-
additionalQueryParams(batchCancelParams.additionalQueryParams)
79-
additionalBodyProperties(batchCancelParams.additionalBodyProperties)
63+
batchId = batchCancelParams.batchId
64+
additionalHeaders = batchCancelParams.additionalHeaders.toBuilder()
65+
additionalQueryParams = batchCancelParams.additionalQueryParams.toBuilder()
66+
additionalBodyProperties = batchCancelParams.additionalBodyProperties.toMutableMap()
8067
}
8168

8269
fun batchId(batchId: String) = apply { this.batchId = batchId }
@@ -209,4 +196,17 @@ constructor(
209196
additionalBodyProperties.toImmutable(),
210197
)
211198
}
199+
200+
override fun equals(other: Any?): Boolean {
201+
if (this === other) {
202+
return true
203+
}
204+
205+
return /* spotless:off */ other is BatchCancelParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
206+
}
207+
208+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
209+
210+
override fun toString() =
211+
"BatchCancelParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
212212
}

‎openai-java-core/src/main/kotlin/com/openai/models/BatchCreateParams.kt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ constructor(
3939

4040
fun metadata(): Optional<Metadata> = Optional.ofNullable(metadata)
4141

42+
fun _additionalHeaders(): Headers = additionalHeaders
43+
44+
fun _additionalQueryParams(): QueryParams = additionalQueryParams
45+
46+
fun _additionalBodyProperties(): Map<String, JsonValue> = additionalBodyProperties
47+
4248
@JvmSynthetic
4349
internal fun getBody(): BatchCreateBody {
4450
return BatchCreateBody(
@@ -204,25 +210,6 @@ constructor(
204210
"BatchCreateBody{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalProperties=$additionalProperties}"
205211
}
206212

207-
fun _additionalHeaders(): Headers = additionalHeaders
208-
209-
fun _additionalQueryParams(): QueryParams = additionalQueryParams
210-
211-
fun _additionalBodyProperties(): Map<String, JsonValue> = additionalBodyProperties
212-
213-
override fun equals(other: Any?): Boolean {
214-
if (this === other) {
215-
return true
216-
}
217-
218-
return /* spotless:off */ other is BatchCreateParams && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
219-
}
220-
221-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(completionWindow, endpoint, inputFileId, metadata, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
222-
223-
override fun toString() =
224-
"BatchCreateParams{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
225-
226213
fun toBuilder() = Builder().from(this)
227214

228215
companion object {
@@ -243,13 +230,13 @@ constructor(
243230

244231
@JvmSynthetic
245232
internal fun from(batchCreateParams: BatchCreateParams) = apply {
246-
this.completionWindow = batchCreateParams.completionWindow
247-
this.endpoint = batchCreateParams.endpoint
248-
this.inputFileId = batchCreateParams.inputFileId
249-
this.metadata = batchCreateParams.metadata
250-
additionalHeaders(batchCreateParams.additionalHeaders)
251-
additionalQueryParams(batchCreateParams.additionalQueryParams)
252-
additionalBodyProperties(batchCreateParams.additionalBodyProperties)
233+
completionWindow = batchCreateParams.completionWindow
234+
endpoint = batchCreateParams.endpoint
235+
inputFileId = batchCreateParams.inputFileId
236+
metadata = batchCreateParams.metadata
237+
additionalHeaders = batchCreateParams.additionalHeaders.toBuilder()
238+
additionalQueryParams = batchCreateParams.additionalQueryParams.toBuilder()
239+
additionalBodyProperties = batchCreateParams.additionalBodyProperties.toMutableMap()
253240
}
254241

255242
/**
@@ -591,4 +578,17 @@ constructor(
591578

592579
override fun toString() = "Metadata{additionalProperties=$additionalProperties}"
593580
}
581+
582+
override fun equals(other: Any?): Boolean {
583+
if (this === other) {
584+
return true
585+
}
586+
587+
return /* spotless:off */ other is BatchCreateParams && completionWindow == other.completionWindow && endpoint == other.endpoint && inputFileId == other.inputFileId && metadata == other.metadata && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
588+
}
589+
590+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(completionWindow, endpoint, inputFileId, metadata, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
591+
592+
override fun toString() =
593+
"BatchCreateParams{completionWindow=$completionWindow, endpoint=$endpoint, inputFileId=$inputFileId, metadata=$metadata, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
594594
}

‎openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ constructor(
2121

2222
fun limit(): Optional<Long> = Optional.ofNullable(limit)
2323

24+
fun _additionalHeaders(): Headers = additionalHeaders
25+
26+
fun _additionalQueryParams(): QueryParams = additionalQueryParams
27+
2428
@JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders
2529

2630
@JvmSynthetic
@@ -32,23 +36,6 @@ constructor(
3236
return queryParams.build()
3337
}
3438

35-
fun _additionalHeaders(): Headers = additionalHeaders
36-
37-
fun _additionalQueryParams(): QueryParams = additionalQueryParams
38-
39-
override fun equals(other: Any?): Boolean {
40-
if (this === other) {
41-
return true
42-
}
43-
44-
return /* spotless:off */ other is BatchListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */
45-
}
46-
47-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */
48-
49-
override fun toString() =
50-
"BatchListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}"
51-
5239
fun toBuilder() = Builder().from(this)
5340

5441
companion object {
@@ -66,10 +53,10 @@ constructor(
6653

6754
@JvmSynthetic
6855
internal fun from(batchListParams: BatchListParams) = apply {
69-
this.after = batchListParams.after
70-
this.limit = batchListParams.limit
71-
additionalHeaders(batchListParams.additionalHeaders)
72-
additionalQueryParams(batchListParams.additionalQueryParams)
56+
after = batchListParams.after
57+
limit = batchListParams.limit
58+
additionalHeaders = batchListParams.additionalHeaders.toBuilder()
59+
additionalQueryParams = batchListParams.additionalQueryParams.toBuilder()
7360
}
7461

7562
/**
@@ -192,4 +179,17 @@ constructor(
192179
additionalQueryParams.build(),
193180
)
194181
}
182+
183+
override fun equals(other: Any?): Boolean {
184+
if (this === other) {
185+
return true
186+
}
187+
188+
return /* spotless:off */ other is BatchListParams && after == other.after && limit == other.limit && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */
189+
}
190+
191+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(after, limit, additionalHeaders, additionalQueryParams) /* spotless:on */
192+
193+
override fun toString() =
194+
"BatchListParams{after=$after, limit=$limit, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}"
195195
}

‎openai-java-core/src/main/kotlin/com/openai/models/BatchRetrieveParams.kt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ constructor(
1717

1818
fun batchId(): String = batchId
1919

20+
fun _additionalHeaders(): Headers = additionalHeaders
21+
22+
fun _additionalQueryParams(): QueryParams = additionalQueryParams
23+
2024
@JvmSynthetic internal fun getHeaders(): Headers = additionalHeaders
2125

2226
@JvmSynthetic internal fun getQueryParams(): QueryParams = additionalQueryParams
@@ -28,23 +32,6 @@ constructor(
2832
}
2933
}
3034

31-
fun _additionalHeaders(): Headers = additionalHeaders
32-
33-
fun _additionalQueryParams(): QueryParams = additionalQueryParams
34-
35-
override fun equals(other: Any?): Boolean {
36-
if (this === other) {
37-
return true
38-
}
39-
40-
return /* spotless:off */ other is BatchRetrieveParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */
41-
}
42-
43-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams) /* spotless:on */
44-
45-
override fun toString() =
46-
"BatchRetrieveParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}"
47-
4835
fun toBuilder() = Builder().from(this)
4936

5037
companion object {
@@ -61,9 +48,9 @@ constructor(
6148

6249
@JvmSynthetic
6350
internal fun from(batchRetrieveParams: BatchRetrieveParams) = apply {
64-
this.batchId = batchRetrieveParams.batchId
65-
additionalHeaders(batchRetrieveParams.additionalHeaders)
66-
additionalQueryParams(batchRetrieveParams.additionalQueryParams)
51+
batchId = batchRetrieveParams.batchId
52+
additionalHeaders = batchRetrieveParams.additionalHeaders.toBuilder()
53+
additionalQueryParams = batchRetrieveParams.additionalQueryParams.toBuilder()
6754
}
6855

6956
fun batchId(batchId: String) = apply { this.batchId = batchId }
@@ -173,4 +160,17 @@ constructor(
173160
additionalQueryParams.build(),
174161
)
175162
}
163+
164+
override fun equals(other: Any?): Boolean {
165+
if (this === other) {
166+
return true
167+
}
168+
169+
return /* spotless:off */ other is BatchRetrieveParams && batchId == other.batchId && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams /* spotless:on */
170+
}
171+
172+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(batchId, additionalHeaders, additionalQueryParams) /* spotless:on */
173+
174+
override fun toString() =
175+
"BatchRetrieveParams{batchId=$batchId, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams}"
176176
}

0 commit comments

Comments
 (0)