Skip to content

Commit 301bc32

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore(internal): refactor query param serialization impl and tests (#87)
1 parent e6da0bf commit 301bc32

File tree

16 files changed

+173
-116
lines changed

16 files changed

+173
-116
lines changed

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/commits/testresults/TestResultListParams.kt

+11-10
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,17 @@ private constructor(
5757

5858
override fun _headers(): Headers = additionalHeaders
5959

60-
override fun _queryParams(): QueryParams {
61-
val queryParams = QueryParams.builder()
62-
this.includeArchived?.let { queryParams.put("includeArchived", listOf(it.toString())) }
63-
this.page?.let { queryParams.put("page", listOf(it.toString())) }
64-
this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) }
65-
this.status?.let { queryParams.put("status", listOf(it.toString())) }
66-
this.type?.let { queryParams.put("type", listOf(it.toString())) }
67-
queryParams.putAll(additionalQueryParams)
68-
return queryParams.build()
69-
}
60+
override fun _queryParams(): QueryParams =
61+
QueryParams.builder()
62+
.apply {
63+
includeArchived?.let { put("includeArchived", it.toString()) }
64+
page?.let { put("page", it.toString()) }
65+
perPage?.let { put("perPage", it.toString()) }
66+
status?.let { put("status", it.asString()) }
67+
type?.let { put("type", it.asString()) }
68+
putAll(additionalQueryParams)
69+
}
70+
.build()
7071

7172
fun getPathParam(index: Int): String {
7273
return when (index) {

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/inferencepipelines/InferencePipelineRetrieveParams.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ private constructor(
3636

3737
override fun _headers(): Headers = additionalHeaders
3838

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

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

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/inferencepipelines/rows/RowUpdateParams.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@ private constructor(
6262

6363
override fun _headers(): Headers = additionalHeaders
6464

65-
override fun _queryParams(): QueryParams {
66-
val queryParams = QueryParams.builder()
67-
this.inferenceId.let { queryParams.put("inferenceId", listOf(it.toString())) }
68-
queryParams.putAll(additionalQueryParams)
69-
return queryParams.build()
70-
}
65+
override fun _queryParams(): QueryParams =
66+
QueryParams.builder()
67+
.apply {
68+
put("inferenceId", inferenceId)
69+
putAll(additionalQueryParams)
70+
}
71+
.build()
7172

7273
fun getPathParam(index: Int): String {
7374
return when (index) {

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/inferencepipelines/testresults/TestResultListParams.kt

+10-9
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.page?.let { queryParams.put("page", listOf(it.toString())) }
59-
this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) }
60-
this.status?.let { queryParams.put("status", listOf(it.toString())) }
61-
this.type?.let { queryParams.put("type", listOf(it.toString())) }
62-
queryParams.putAll(additionalQueryParams)
63-
return queryParams.build()
64-
}
56+
override fun _queryParams(): QueryParams =
57+
QueryParams.builder()
58+
.apply {
59+
page?.let { put("page", it.toString()) }
60+
perPage?.let { put("perPage", it.toString()) }
61+
status?.let { put("status", it.asString()) }
62+
type?.let { put("type", it.asString()) }
63+
putAll(additionalQueryParams)
64+
}
65+
.build()
6566

6667
fun getPathParam(index: Int): String {
6768
return when (index) {

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/projects/ProjectListParams.kt

+10-9
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,16 @@ private constructor(
4343

4444
override fun _headers(): Headers = additionalHeaders
4545

46-
override fun _queryParams(): QueryParams {
47-
val queryParams = QueryParams.builder()
48-
this.name?.let { queryParams.put("name", listOf(it.toString())) }
49-
this.page?.let { queryParams.put("page", listOf(it.toString())) }
50-
this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) }
51-
this.taskType?.let { queryParams.put("taskType", listOf(it.toString())) }
52-
queryParams.putAll(additionalQueryParams)
53-
return queryParams.build()
54-
}
46+
override fun _queryParams(): QueryParams =
47+
QueryParams.builder()
48+
.apply {
49+
name?.let { put("name", it) }
50+
page?.let { put("page", it.toString()) }
51+
perPage?.let { put("perPage", it.toString()) }
52+
taskType?.let { put("taskType", it.asString()) }
53+
putAll(additionalQueryParams)
54+
}
55+
.build()
5556

5657
fun toBuilder() = Builder().from(this)
5758

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/projects/commits/CommitListParams.kt

+8-7
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.page?.let { queryParams.put("page", listOf(it.toString())) }
41-
this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) }
42-
queryParams.putAll(additionalQueryParams)
43-
return queryParams.build()
44-
}
38+
override fun _queryParams(): QueryParams =
39+
QueryParams.builder()
40+
.apply {
41+
page?.let { put("page", it.toString()) }
42+
perPage?.let { put("perPage", it.toString()) }
43+
putAll(additionalQueryParams)
44+
}
45+
.build()
4546

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

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/projects/inferencepipelines/InferencePipelineListParams.kt

+9-8
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,15 @@ private constructor(
3939

4040
override fun _headers(): Headers = additionalHeaders
4141

42-
override fun _queryParams(): QueryParams {
43-
val queryParams = QueryParams.builder()
44-
this.name?.let { queryParams.put("name", listOf(it.toString())) }
45-
this.page?.let { queryParams.put("page", listOf(it.toString())) }
46-
this.perPage?.let { queryParams.put("perPage", listOf(it.toString())) }
47-
queryParams.putAll(additionalQueryParams)
48-
return queryParams.build()
49-
}
42+
override fun _queryParams(): QueryParams =
43+
QueryParams.builder()
44+
.apply {
45+
name?.let { put("name", it) }
46+
page?.let { put("page", it.toString()) }
47+
perPage?.let { put("perPage", it.toString()) }
48+
putAll(additionalQueryParams)
49+
}
50+
.build()
5051

5152
fun getPathParam(index: Int): String {
5253
return when (index) {

‎openlayer-java-core/src/main/kotlin/com/openlayer/api/models/storage/presignedurl/PresignedUrlCreateParams.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ private constructor(
3636

3737
override fun _headers(): Headers = additionalHeaders
3838

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

4647
fun toBuilder() = Builder().from(this)
4748

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/commits/testresults/TestResultListParamsTest.kt

+17-9
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,19 @@ internal class TestResultListParamsTest {
3131
.status(TestResultListParams.Status.RUNNING)
3232
.type(TestResultListParams.Type.INTEGRITY)
3333
.build()
34-
val expected = QueryParams.builder()
35-
expected.put("includeArchived", "true")
36-
expected.put("page", "1")
37-
expected.put("perPage", "1")
38-
expected.put("status", TestResultListParams.Status.RUNNING.toString())
39-
expected.put("type", TestResultListParams.Type.INTEGRITY.toString())
40-
assertThat(params._queryParams()).isEqualTo(expected.build())
34+
35+
val queryParams = params._queryParams()
36+
37+
assertThat(queryParams)
38+
.isEqualTo(
39+
QueryParams.builder()
40+
.put("includeArchived", "true")
41+
.put("page", "1")
42+
.put("perPage", "1")
43+
.put("status", "running")
44+
.put("type", "integrity")
45+
.build()
46+
)
4147
}
4248

4349
@Test
@@ -46,8 +52,10 @@ internal class TestResultListParamsTest {
4652
TestResultListParams.builder()
4753
.projectVersionId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
4854
.build()
49-
val expected = QueryParams.builder()
50-
assertThat(params._queryParams()).isEqualTo(expected.build())
55+
56+
val queryParams = params._queryParams()
57+
58+
assertThat(queryParams).isEqualTo(QueryParams.builder().build())
5159
}
5260

5361
@Test

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/inferencepipelines/InferencePipelineRetrieveParamsTest.kt

+11-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ internal class InferencePipelineRetrieveParamsTest {
2323
.inferencePipelineId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
2424
.addExpand(InferencePipelineRetrieveParams.Expand.PROJECT)
2525
.build()
26-
val expected = QueryParams.builder()
27-
expected.put("expand", InferencePipelineRetrieveParams.Expand.PROJECT.toString())
28-
assertThat(params._queryParams()).isEqualTo(expected.build())
26+
27+
val queryParams = params._queryParams()
28+
29+
assertThat(queryParams)
30+
.isEqualTo(
31+
QueryParams.builder().put("expand", listOf("project").joinToString(",")).build()
32+
)
2933
}
3034

3135
@Test
@@ -34,8 +38,10 @@ internal class InferencePipelineRetrieveParamsTest {
3438
InferencePipelineRetrieveParams.builder()
3539
.inferencePipelineId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
3640
.build()
37-
val expected = QueryParams.builder()
38-
assertThat(params._queryParams()).isEqualTo(expected.build())
41+
42+
val queryParams = params._queryParams()
43+
44+
assertThat(queryParams).isEqualTo(QueryParams.builder().build())
3945
}
4046

4147
@Test

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/inferencepipelines/rows/RowUpdateParamsTest.kt

+10-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ internal class RowUpdateParamsTest {
4343
.build()
4444
)
4545
.build()
46-
val expected = QueryParams.builder()
47-
expected.put("inferenceId", "inferenceId")
48-
assertThat(params._queryParams()).isEqualTo(expected.build())
46+
47+
val queryParams = params._queryParams()
48+
49+
assertThat(queryParams)
50+
.isEqualTo(QueryParams.builder().put("inferenceId", "inferenceId").build())
4951
}
5052

5153
@Test
@@ -56,9 +58,11 @@ internal class RowUpdateParamsTest {
5658
.inferenceId("inferenceId")
5759
.row(JsonValue.from(mapOf<String, Any>()))
5860
.build()
59-
val expected = QueryParams.builder()
60-
expected.put("inferenceId", "inferenceId")
61-
assertThat(params._queryParams()).isEqualTo(expected.build())
61+
62+
val queryParams = params._queryParams()
63+
64+
assertThat(queryParams)
65+
.isEqualTo(QueryParams.builder().put("inferenceId", "inferenceId").build())
6266
}
6367

6468
@Test

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/inferencepipelines/testresults/TestResultListParamsTest.kt

+16-8
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ internal class TestResultListParamsTest {
2929
.status(TestResultListParams.Status.RUNNING)
3030
.type(TestResultListParams.Type.INTEGRITY)
3131
.build()
32-
val expected = QueryParams.builder()
33-
expected.put("page", "1")
34-
expected.put("perPage", "1")
35-
expected.put("status", TestResultListParams.Status.RUNNING.toString())
36-
expected.put("type", TestResultListParams.Type.INTEGRITY.toString())
37-
assertThat(params._queryParams()).isEqualTo(expected.build())
32+
33+
val queryParams = params._queryParams()
34+
35+
assertThat(queryParams)
36+
.isEqualTo(
37+
QueryParams.builder()
38+
.put("page", "1")
39+
.put("perPage", "1")
40+
.put("status", "running")
41+
.put("type", "integrity")
42+
.build()
43+
)
3844
}
3945

4046
@Test
@@ -43,8 +49,10 @@ internal class TestResultListParamsTest {
4349
TestResultListParams.builder()
4450
.inferencePipelineId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
4551
.build()
46-
val expected = QueryParams.builder()
47-
assertThat(params._queryParams()).isEqualTo(expected.build())
52+
53+
val queryParams = params._queryParams()
54+
55+
assertThat(queryParams).isEqualTo(QueryParams.builder().build())
4856
}
4957

5058
@Test

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/projects/ProjectListParamsTest.kt

+16-8
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,26 @@ internal class ProjectListParamsTest {
2727
.perPage(1L)
2828
.taskType(ProjectListParams.TaskType.LLM_BASE)
2929
.build()
30-
val expected = QueryParams.builder()
31-
expected.put("name", "name")
32-
expected.put("page", "1")
33-
expected.put("perPage", "1")
34-
expected.put("taskType", ProjectListParams.TaskType.LLM_BASE.toString())
35-
assertThat(params._queryParams()).isEqualTo(expected.build())
30+
31+
val queryParams = params._queryParams()
32+
33+
assertThat(queryParams)
34+
.isEqualTo(
35+
QueryParams.builder()
36+
.put("name", "name")
37+
.put("page", "1")
38+
.put("perPage", "1")
39+
.put("taskType", "llm-base")
40+
.build()
41+
)
3642
}
3743

3844
@Test
3945
fun queryParamsWithoutOptionalFields() {
4046
val params = ProjectListParams.builder().build()
41-
val expected = QueryParams.builder()
42-
assertThat(params._queryParams()).isEqualTo(expected.build())
47+
48+
val queryParams = params._queryParams()
49+
50+
assertThat(queryParams).isEqualTo(QueryParams.builder().build())
4351
}
4452
}

‎openlayer-java-core/src/test/kotlin/com/openlayer/api/models/projects/commits/CommitListParamsTest.kt

+9-6
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@ internal class CommitListParamsTest {
2525
.page(1L)
2626
.perPage(1L)
2727
.build()
28-
val expected = QueryParams.builder()
29-
expected.put("page", "1")
30-
expected.put("perPage", "1")
31-
assertThat(params._queryParams()).isEqualTo(expected.build())
28+
29+
val queryParams = params._queryParams()
30+
31+
assertThat(queryParams)
32+
.isEqualTo(QueryParams.builder().put("page", "1").put("perPage", "1").build())
3233
}
3334

3435
@Test
3536
fun queryParamsWithoutOptionalFields() {
3637
val params =
3738
CommitListParams.builder().projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").build()
38-
val expected = QueryParams.builder()
39-
assertThat(params._queryParams()).isEqualTo(expected.build())
39+
40+
val queryParams = params._queryParams()
41+
42+
assertThat(queryParams).isEqualTo(QueryParams.builder().build())
4043
}
4144

4245
@Test

0 commit comments

Comments
 (0)