Skip to content

Commit f6f64f2

Browse files
committed
remove JsonArrayBuilder addAll varargs util
1 parent 2b01d9c commit f6f64f2

File tree

3 files changed

+5
-34
lines changed

3 files changed

+5
-34
lines changed

formats/json-tests/commonTest/src/kotlinx/serialization/json/JsonBuildersTest.kt

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,23 @@ class JsonBuildersTest {
4747
@Test
4848
fun testBuildJsonArrayAddAll() {
4949
assertEquals(
50-
"""[1,2,3,4,5,null,1,2,3,4,5,null]""",
50+
"""[1,2,3,4,5,null]""",
5151
buildJsonArray {
52-
assertTrue { addAll(1) }
53-
assertTrue { addAll(2, 3, 4, 5, null) }
5452
assertTrue { addAll(listOf(1, 2, 3, 4, 5, null)) }
5553
}.toString()
5654
)
5755

5856
assertEquals(
59-
"""["a","b","c",null,"a","b","c",null]""",
57+
"""["a","b","c",null]""",
6058
buildJsonArray {
61-
assertTrue { addAll("a") }
62-
assertTrue { addAll("b", "c", null) }
6359
assertTrue { addAll(listOf("a", "b", "c", null)) }
6460
}.toString()
6561
)
6662

6763
assertEquals(
68-
"""[true,true,true,null,false,false,false,null]""",
64+
"""[true,false,null]""",
6965
buildJsonArray {
70-
assertTrue { addAll(true) }
71-
assertTrue { addAll(true, true, null) }
72-
assertTrue { addAll(listOf(false, false, false, null)) }
66+
assertTrue { addAll(listOf(true, false, null)) }
7367
}.toString()
7468
)
7569

@@ -90,7 +84,7 @@ class JsonBuildersTest {
9084
JsonPrimitive(2),
9185
JsonPrimitive("b"),
9286
JsonPrimitive(true),
93-
JsonNull
87+
JsonNull,
9488
)
9589
)
9690
}
@@ -163,11 +157,6 @@ class JsonBuildersTest {
163157
assertEquals(
164158
"""[]""",
165159
buildJsonArray {
166-
// varargs
167-
assertFalse { addAll(*arrayOf<String>()) }
168-
assertFalse { addAll(*arrayOf<Boolean>()) }
169-
assertFalse { addAll(*arrayOf<Number>()) }
170-
171160
// add collections
172161
assertFalse { addAll(listOf<Number>()) }
173162
assertFalse { addAll(listOf<String>()) }

formats/json/api/kotlinx-serialization-json.api

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ public final class kotlinx/serialization/json/JsonElementBuildersKt {
174174
public static final fun add (Lkotlinx/serialization/json/JsonArrayBuilder;Ljava/lang/Number;)Z
175175
public static final fun add (Lkotlinx/serialization/json/JsonArrayBuilder;Ljava/lang/String;)Z
176176
public static final fun add (Lkotlinx/serialization/json/JsonArrayBuilder;Ljava/lang/Void;)Z
177-
public static final fun addAll (Lkotlinx/serialization/json/JsonArrayBuilder;[Ljava/lang/Boolean;)Z
178-
public static final fun addAll (Lkotlinx/serialization/json/JsonArrayBuilder;[Ljava/lang/Number;)Z
179-
public static final fun addAll (Lkotlinx/serialization/json/JsonArrayBuilder;[Ljava/lang/String;)Z
180177
public static final fun addAll (Lkotlinx/serialization/json/JsonArrayBuilder;[Lkotlinx/serialization/json/JsonElement;)Z
181178
public static final fun addAllBooleans (Lkotlinx/serialization/json/JsonArrayBuilder;Ljava/util/Collection;)Z
182179
public static final fun addAllNumbers (Lkotlinx/serialization/json/JsonArrayBuilder;Ljava/util/Collection;)Z

formats/json/commonMain/src/kotlinx/serialization/json/JsonElementBuilders.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -226,20 +226,5 @@ public fun JsonArrayBuilder.addAll(values: Collection<Boolean?>): Boolean =
226226
public fun JsonArrayBuilder.addAll(values: Collection<Number?>): Boolean =
227227
addAll(values.map(::JsonPrimitive))
228228

229-
/** Adds the given string [values] to a resulting JSON array. */
230-
@ExperimentalSerializationApi
231-
public fun JsonArrayBuilder.addAll(vararg values: String?): Boolean =
232-
addAll(values.toList())
233-
234-
/** Adds the given boolean [values] to a resulting JSON array. */
235-
@ExperimentalSerializationApi
236-
public fun JsonArrayBuilder.addAll(vararg values: Boolean?): Boolean =
237-
addAll(values.toList())
238-
239-
/** Adds the given numeric [values] to a resulting JSON array. */
240-
@ExperimentalSerializationApi
241-
public fun JsonArrayBuilder.addAll(vararg values: Number?): Boolean =
242-
addAll(values.toList())
243-
244229
@DslMarker
245230
internal annotation class JsonDslMarker

0 commit comments

Comments
 (0)