Skip to content

Commit 93558fc

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore(internal): refactor query param serialization impl and tests (#322)
1 parent 31a8e9e commit 93558fc

32 files changed

+377
-265
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ private constructor(
3838

3939
override fun _headers(): Headers = additionalHeaders
4040

41-
override fun _queryParams(): QueryParams {
42-
val queryParams = QueryParams.builder()
43-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
44-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
45-
queryParams.putAll(additionalQueryParams)
46-
return queryParams.build()
47-
}
41+
override fun _queryParams(): QueryParams =
42+
QueryParams.builder()
43+
.apply {
44+
after?.let { put("after", it) }
45+
limit?.let { put("limit", it.toString()) }
46+
putAll(additionalQueryParams)
47+
}
48+
.build()
4849

4950
fun toBuilder() = Builder().from(this)
5051

‎openai-java-core/src/main/kotlin/com/openai/models/beta/assistants/AssistantListParams.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,16 @@ private constructor(
5757

5858
override fun _headers(): Headers = additionalHeaders
5959

60-
override fun _queryParams(): QueryParams {
61-
val queryParams = QueryParams.builder()
62-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
63-
this.before?.let { queryParams.put("before", listOf(it.toString())) }
64-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
65-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
66-
queryParams.putAll(additionalQueryParams)
67-
return queryParams.build()
68-
}
60+
override fun _queryParams(): QueryParams =
61+
QueryParams.builder()
62+
.apply {
63+
after?.let { put("after", it) }
64+
before?.let { put("before", it) }
65+
limit?.let { put("limit", it.toString()) }
66+
order?.let { put("order", it.asString()) }
67+
putAll(additionalQueryParams)
68+
}
69+
.build()
6970

7071
fun toBuilder() = Builder().from(this)
7172

‎openai-java-core/src/main/kotlin/com/openai/models/beta/threads/messages/MessageListParams.kt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ private constructor(
6565

6666
override fun _headers(): Headers = additionalHeaders
6767

68-
override fun _queryParams(): QueryParams {
69-
val queryParams = QueryParams.builder()
70-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
71-
this.before?.let { queryParams.put("before", listOf(it.toString())) }
72-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
73-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
74-
this.runId?.let { queryParams.put("run_id", listOf(it.toString())) }
75-
queryParams.putAll(additionalQueryParams)
76-
return queryParams.build()
77-
}
68+
override fun _queryParams(): QueryParams =
69+
QueryParams.builder()
70+
.apply {
71+
after?.let { put("after", it) }
72+
before?.let { put("before", it) }
73+
limit?.let { put("limit", it.toString()) }
74+
order?.let { put("order", it.asString()) }
75+
runId?.let { put("run_id", it) }
76+
putAll(additionalQueryParams)
77+
}
78+
.build()
7879

7980
fun getPathParam(index: Int): String {
8081
return when (index) {

‎openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunCreateParams.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,13 @@ private constructor(
381381

382382
override fun _headers(): Headers = additionalHeaders
383383

384-
override fun _queryParams(): QueryParams {
385-
val queryParams = QueryParams.builder()
386-
this.include?.let { queryParams.put("include[]", it.map(Any::toString)) }
387-
queryParams.putAll(additionalQueryParams)
388-
return queryParams.build()
389-
}
384+
override fun _queryParams(): QueryParams =
385+
QueryParams.builder()
386+
.apply {
387+
include?.forEach { put("include[]", it.asString()) }
388+
putAll(additionalQueryParams)
389+
}
390+
.build()
390391

391392
fun getPathParam(index: Int): String {
392393
return when (index) {

‎openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/RunListParams.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ private constructor(
6161

6262
override fun _headers(): Headers = additionalHeaders
6363

64-
override fun _queryParams(): QueryParams {
65-
val queryParams = QueryParams.builder()
66-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
67-
this.before?.let { queryParams.put("before", listOf(it.toString())) }
68-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
69-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
70-
queryParams.putAll(additionalQueryParams)
71-
return queryParams.build()
72-
}
64+
override fun _queryParams(): QueryParams =
65+
QueryParams.builder()
66+
.apply {
67+
after?.let { put("after", it) }
68+
before?.let { put("before", it) }
69+
limit?.let { put("limit", it.toString()) }
70+
order?.let { put("order", it.asString()) }
71+
putAll(additionalQueryParams)
72+
}
73+
.build()
7374

7475
fun getPathParam(index: Int): String {
7576
return when (index) {

‎openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepListParams.kt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,17 @@ private constructor(
7777

7878
override fun _headers(): Headers = additionalHeaders
7979

80-
override fun _queryParams(): QueryParams {
81-
val queryParams = QueryParams.builder()
82-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
83-
this.before?.let { queryParams.put("before", listOf(it.toString())) }
84-
this.include?.let { queryParams.put("include[]", it.map(Any::toString)) }
85-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
86-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
87-
queryParams.putAll(additionalQueryParams)
88-
return queryParams.build()
89-
}
80+
override fun _queryParams(): QueryParams =
81+
QueryParams.builder()
82+
.apply {
83+
after?.let { put("after", it) }
84+
before?.let { put("before", it) }
85+
include?.forEach { put("include[]", it.asString()) }
86+
limit?.let { put("limit", it.toString()) }
87+
order?.let { put("order", it.asString()) }
88+
putAll(additionalQueryParams)
89+
}
90+
.build()
9091

9192
fun getPathParam(index: Int): String {
9293
return when (index) {

‎openai-java-core/src/main/kotlin/com/openai/models/beta/threads/runs/steps/StepRetrieveParams.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ private constructor(
4646

4747
override fun _headers(): Headers = additionalHeaders
4848

49-
override fun _queryParams(): QueryParams {
50-
val queryParams = QueryParams.builder()
51-
this.include?.let { queryParams.put("include[]", it.map(Any::toString)) }
52-
queryParams.putAll(additionalQueryParams)
53-
return queryParams.build()
54-
}
49+
override fun _queryParams(): QueryParams =
50+
QueryParams.builder()
51+
.apply {
52+
include?.forEach { put("include[]", it.asString()) }
53+
putAll(additionalQueryParams)
54+
}
55+
.build()
5556

5657
fun getPathParam(index: Int): String {
5758
return when (index) {

‎openai-java-core/src/main/kotlin/com/openai/models/chat/completions/messages/MessageListParams.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ private constructor(
4949

5050
override fun _headers(): Headers = additionalHeaders
5151

52-
override fun _queryParams(): QueryParams {
53-
val queryParams = QueryParams.builder()
54-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
55-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
56-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
57-
queryParams.putAll(additionalQueryParams)
58-
return queryParams.build()
59-
}
52+
override fun _queryParams(): QueryParams =
53+
QueryParams.builder()
54+
.apply {
55+
after?.let { put("after", it) }
56+
limit?.let { put("limit", it.toString()) }
57+
order?.let { put("order", it.asString()) }
58+
putAll(additionalQueryParams)
59+
}
60+
.build()
6061

6162
fun getPathParam(index: Int): String {
6263
return when (index) {

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,16 @@ private constructor(
5353

5454
override fun _headers(): Headers = additionalHeaders
5555

56-
override fun _queryParams(): QueryParams {
57-
val queryParams = QueryParams.builder()
58-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
59-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
60-
this.order?.let { queryParams.put("order", listOf(it.toString())) }
61-
this.purpose?.let { queryParams.put("purpose", listOf(it.toString())) }
62-
queryParams.putAll(additionalQueryParams)
63-
return queryParams.build()
64-
}
56+
override fun _queryParams(): QueryParams =
57+
QueryParams.builder()
58+
.apply {
59+
after?.let { put("after", it) }
60+
limit?.let { put("limit", it.toString()) }
61+
order?.let { put("order", it.asString()) }
62+
purpose?.let { put("purpose", it) }
63+
putAll(additionalQueryParams)
64+
}
65+
.build()
6566

6667
fun toBuilder() = Builder().from(this)
6768

‎openai-java-core/src/main/kotlin/com/openai/models/finetuning/jobs/JobListEventsParams.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ private constructor(
3535

3636
override fun _headers(): Headers = additionalHeaders
3737

38-
override fun _queryParams(): QueryParams {
39-
val queryParams = QueryParams.builder()
40-
this.after?.let { queryParams.put("after", listOf(it.toString())) }
41-
this.limit?.let { queryParams.put("limit", listOf(it.toString())) }
42-
queryParams.putAll(additionalQueryParams)
43-
return queryParams.build()
44-
}
38+
override fun _queryParams(): QueryParams =
39+
QueryParams.builder()
40+
.apply {
41+
after?.let { put("after", it) }
42+
limit?.let { put("limit", it.toString()) }
43+
putAll(additionalQueryParams)
44+
}
45+
.build()
4546

4647
fun getPathParam(index: Int): String {
4748
return when (index) {

0 commit comments

Comments
 (0)