Skip to content

Commit 2032642

Browse files
Jozott00Jozott00
committed
grpc-pb: Throw exception instead of Boolean when encoding value
Signed-off-by: Johannes Zottele <[email protected]>
1 parent e4c5d2d commit 2032642

File tree

4 files changed

+161
-166
lines changed

4 files changed

+161
-166
lines changed

‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/pb/WireEncoder.kt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,42 @@ import kotlinx.rpc.internal.utils.InternalRpcApi
1919
@OptIn(ExperimentalUnsignedTypes::class)
2020
public interface WireEncoder {
2121
public fun flush()
22-
public fun writeBool(fieldNr: Int, value: Boolean): Boolean
23-
public fun writeInt32(fieldNr: Int, value: Int): Boolean
24-
public fun writeInt64(fieldNr: Int, value: Long): Boolean
25-
public fun writeUInt32(fieldNr: Int, value: UInt): Boolean
26-
public fun writeUInt64(fieldNr: Int, value: ULong): Boolean
27-
public fun writeSInt32(fieldNr: Int, value: Int): Boolean
28-
public fun writeSInt64(fieldNr: Int, value: Long): Boolean
29-
public fun writeFixed32(fieldNr: Int, value: UInt): Boolean
30-
public fun writeFixed64(fieldNr: Int, value: ULong): Boolean
31-
public fun writeSFixed32(fieldNr: Int, value: Int): Boolean
32-
public fun writeSFixed64(fieldNr: Int, value: Long): Boolean
33-
public fun writeFloat(fieldNr: Int, value: Float): Boolean
34-
public fun writeDouble(fieldNr: Int, value: Double): Boolean
35-
public fun writeEnum(fieldNr: Int, value: Int): Boolean
36-
public fun writeBytes(fieldNr: Int, value: ByteArray): Boolean
37-
public fun writeString(fieldNr: Int, value: String): Boolean
38-
public fun writePackedBool(fieldNr: Int, value: List<Boolean>, fieldSize: Int): Boolean
39-
public fun writePackedInt32(fieldNr: Int, value: List<Int>, fieldSize: Int): Boolean
40-
public fun writePackedInt64(fieldNr: Int, value: List<Long>, fieldSize: Int): Boolean
41-
public fun writePackedUInt32(fieldNr: Int, value: List<UInt>, fieldSize: Int): Boolean
42-
public fun writePackedUInt64(fieldNr: Int, value: List<ULong>, fieldSize: Int): Boolean
43-
public fun writePackedSInt32(fieldNr: Int, value: List<Int>, fieldSize: Int): Boolean
44-
public fun writePackedSInt64(fieldNr: Int, value: List<Long>, fieldSize: Int): Boolean
45-
public fun writePackedFixed32(fieldNr: Int, value: List<UInt>): Boolean
46-
public fun writePackedFixed64(fieldNr: Int, value: List<ULong>): Boolean
47-
public fun writePackedSFixed32(fieldNr: Int, value: List<Int>): Boolean
48-
public fun writePackedSFixed64(fieldNr: Int, value: List<Long>): Boolean
49-
public fun writePackedFloat(fieldNr: Int, value: List<Float>): Boolean
50-
public fun writePackedDouble(fieldNr: Int, value: List<Double>): Boolean
51-
public fun writePackedEnum(fieldNr: Int, value: List<Int>, fieldSize: Int): Boolean =
22+
public fun writeBool(fieldNr: Int, value: Boolean)
23+
public fun writeInt32(fieldNr: Int, value: Int)
24+
public fun writeInt64(fieldNr: Int, value: Long)
25+
public fun writeUInt32(fieldNr: Int, value: UInt)
26+
public fun writeUInt64(fieldNr: Int, value: ULong)
27+
public fun writeSInt32(fieldNr: Int, value: Int)
28+
public fun writeSInt64(fieldNr: Int, value: Long)
29+
public fun writeFixed32(fieldNr: Int, value: UInt)
30+
public fun writeFixed64(fieldNr: Int, value: ULong)
31+
public fun writeSFixed32(fieldNr: Int, value: Int)
32+
public fun writeSFixed64(fieldNr: Int, value: Long)
33+
public fun writeFloat(fieldNr: Int, value: Float)
34+
public fun writeDouble(fieldNr: Int, value: Double)
35+
public fun writeEnum(fieldNr: Int, value: Int)
36+
public fun writeBytes(fieldNr: Int, value: ByteArray)
37+
public fun writeString(fieldNr: Int, value: String)
38+
public fun writePackedBool(fieldNr: Int, value: List<Boolean>, fieldSize: Int)
39+
public fun writePackedInt32(fieldNr: Int, value: List<Int>, fieldSize: Int)
40+
public fun writePackedInt64(fieldNr: Int, value: List<Long>, fieldSize: Int)
41+
public fun writePackedUInt32(fieldNr: Int, value: List<UInt>, fieldSize: Int)
42+
public fun writePackedUInt64(fieldNr: Int, value: List<ULong>, fieldSize: Int)
43+
public fun writePackedSInt32(fieldNr: Int, value: List<Int>, fieldSize: Int)
44+
public fun writePackedSInt64(fieldNr: Int, value: List<Long>, fieldSize: Int)
45+
public fun writePackedFixed32(fieldNr: Int, value: List<UInt>)
46+
public fun writePackedFixed64(fieldNr: Int, value: List<ULong>)
47+
public fun writePackedSFixed32(fieldNr: Int, value: List<Int>)
48+
public fun writePackedSFixed64(fieldNr: Int, value: List<Long>)
49+
public fun writePackedFloat(fieldNr: Int, value: List<Float>)
50+
public fun writePackedDouble(fieldNr: Int, value: List<Double>)
51+
public fun writePackedEnum(fieldNr: Int, value: List<Int>, fieldSize: Int): Unit =
5252
writePackedInt32(fieldNr, value, fieldSize)
5353

5454
public fun <T : InternalMessage> writeMessage(
5555
fieldNr: Int,
5656
value: T,
57-
encode: T.(WireEncoder) -> Unit
57+
encode: T.(WireEncoder) -> Unit,
5858
)
5959

6060
}

‎grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/pb/WireCodecTest.kt

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class WireCodecTest {
2222
val buffer = Buffer()
2323

2424
val encoder = WireEncoder(buffer)
25-
assertTrue(encoder.writeBool(fieldNr, true))
25+
encoder.writeBool(fieldNr, true)
2626
encoder.flush()
2727

2828
val decoder = WireDecoder(buffer)
@@ -47,7 +47,7 @@ class WireCodecTest {
4747
val buffer = Buffer()
4848

4949
val encoder = WireEncoder(buffer)
50-
assertTrue(encoder.writeInt32(fieldNr, testValue))
50+
encoder.writeInt32(fieldNr, testValue)
5151
encoder.flush()
5252

5353
val decoder = WireDecoder(buffer)
@@ -72,7 +72,7 @@ class WireCodecTest {
7272
val buffer = Buffer()
7373

7474
val encoder = WireEncoder(buffer)
75-
assertTrue(encoder.writeInt64(fieldNr, testValue))
75+
encoder.writeInt64(fieldNr, testValue)
7676
encoder.flush()
7777

7878
val decoder = WireDecoder(buffer)
@@ -97,7 +97,7 @@ class WireCodecTest {
9797
val buffer = Buffer()
9898

9999
val encoder = WireEncoder(buffer)
100-
assertTrue(encoder.writeUInt32(fieldNr, testValue))
100+
encoder.writeUInt32(fieldNr, testValue)
101101
encoder.flush()
102102

103103
val decoder = WireDecoder(buffer)
@@ -122,7 +122,7 @@ class WireCodecTest {
122122
val buffer = Buffer()
123123

124124
val encoder = WireEncoder(buffer)
125-
assertTrue(encoder.writeUInt64(fieldNr, testValue))
125+
encoder.writeUInt64(fieldNr, testValue)
126126
encoder.flush()
127127

128128
val decoder = WireDecoder(buffer)
@@ -147,7 +147,7 @@ class WireCodecTest {
147147
val buffer = Buffer()
148148

149149
val encoder = WireEncoder(buffer)
150-
assertTrue(encoder.writeSInt32(fieldNr, testValue))
150+
encoder.writeSInt32(fieldNr, testValue)
151151
encoder.flush()
152152

153153
val decoder = WireDecoder(buffer)
@@ -172,7 +172,7 @@ class WireCodecTest {
172172
val buffer = Buffer()
173173

174174
val encoder = WireEncoder(buffer)
175-
assertTrue(encoder.writeSInt64(fieldNr, testValue))
175+
encoder.writeSInt64(fieldNr, testValue)
176176
encoder.flush()
177177

178178
val decoder = WireDecoder(buffer)
@@ -197,7 +197,7 @@ class WireCodecTest {
197197
val buffer = Buffer()
198198

199199
val encoder = WireEncoder(buffer)
200-
assertTrue(encoder.writeFixed32(fieldNr, testValue))
200+
encoder.writeFixed32(fieldNr, testValue)
201201
encoder.flush()
202202

203203
val decoder = WireDecoder(buffer)
@@ -222,7 +222,7 @@ class WireCodecTest {
222222
val buffer = Buffer()
223223

224224
val encoder = WireEncoder(buffer)
225-
assertTrue(encoder.writeFixed64(fieldNr, testValue))
225+
encoder.writeFixed64(fieldNr, testValue)
226226
encoder.flush()
227227

228228
val decoder = WireDecoder(buffer)
@@ -247,7 +247,7 @@ class WireCodecTest {
247247
val buffer = Buffer()
248248

249249
val encoder = WireEncoder(buffer)
250-
assertTrue(encoder.writeSFixed32(fieldNr, testValue))
250+
encoder.writeSFixed32(fieldNr, testValue)
251251
encoder.flush()
252252

253253
val decoder = WireDecoder(buffer)
@@ -272,7 +272,7 @@ class WireCodecTest {
272272
val buffer = Buffer()
273273

274274
val encoder = WireEncoder(buffer)
275-
assertTrue(encoder.writeSFixed64(fieldNr, testValue))
275+
encoder.writeSFixed64(fieldNr, testValue)
276276
encoder.flush()
277277

278278
val decoder = WireDecoder(buffer)
@@ -297,7 +297,7 @@ class WireCodecTest {
297297
val buffer = Buffer()
298298

299299
val encoder = WireEncoder(buffer)
300-
assertTrue(encoder.writeEnum(fieldNr, testValue))
300+
encoder.writeEnum(fieldNr, testValue)
301301
encoder.flush()
302302

303303
val decoder = WireDecoder(buffer)
@@ -322,7 +322,7 @@ class WireCodecTest {
322322
val buffer = Buffer()
323323

324324
val encoder = WireEncoder(buffer)
325-
assertTrue(encoder.writeString(fieldNr, testValue))
325+
encoder.writeString(fieldNr, testValue)
326326
encoder.flush()
327327

328328
val decoder = WireDecoder(buffer)
@@ -369,10 +369,10 @@ class WireCodecTest {
369369
val encoder = WireEncoder(buffer)
370370

371371
// Write multiple fields of different types
372-
assertTrue(encoder.writeBool(1, true))
373-
assertTrue(encoder.writeInt32(2, 42))
374-
assertTrue(encoder.writeString(3, "Hello"))
375-
assertTrue(encoder.writeFixed64(4, 123456789uL))
372+
encoder.writeBool(1, true)
373+
encoder.writeInt32(2, 42)
374+
encoder.writeString(3, "Hello")
375+
encoder.writeFixed64(4, 123456789uL)
376376
encoder.flush()
377377

378378
val decoder = WireDecoder(buffer)
@@ -428,7 +428,7 @@ class WireCodecTest {
428428
val buffer = Buffer()
429429

430430
val encoder = WireEncoder(buffer)
431-
assertTrue(encoder.writeBool(fieldNr, true))
431+
encoder.writeBool(fieldNr, true)
432432
encoder.flush()
433433

434434
val decoder = WireDecoder(buffer)
@@ -448,11 +448,11 @@ class WireCodecTest {
448448
val buffer = Buffer()
449449

450450
val encoder = WireEncoder(buffer)
451-
assertTrue(encoder.writeBool(1, true))
451+
encoder.writeBool(1, true)
452452
encoder.flush()
453453

454454
// Writing after flush should still work
455-
assertTrue(encoder.writeInt32(2, 42))
455+
encoder.writeInt32(2, 42)
456456
encoder.flush()
457457

458458
val decoder = WireDecoder(buffer)
@@ -483,7 +483,7 @@ class WireCodecTest {
483483
val buffer = Buffer()
484484

485485
val encoder = WireEncoder(buffer)
486-
assertTrue(encoder.writeString(fieldNr, testValue))
486+
encoder.writeString(fieldNr, testValue)
487487
encoder.flush()
488488

489489
val decoder = WireDecoder(buffer)
@@ -512,8 +512,8 @@ class WireCodecTest {
512512
val buffer = Buffer()
513513

514514
val encoder = WireEncoder(buffer)
515-
assertTrue(encoder.writeBool(fieldNr, true))
516-
assertTrue(encoder.writeBool(fieldNr + 1, true))
515+
encoder.writeBool(fieldNr, true)
516+
encoder.writeBool(fieldNr + 1, true)
517517
encoder.flush()
518518

519519
WireDecoder(buffer).use { decoder ->
@@ -533,8 +533,8 @@ class WireCodecTest {
533533
val field2Str = "b".repeat(1000000)
534534

535535
val encoder = WireEncoder(buffer)
536-
assertTrue(encoder.writeString(field1Nr, field1Str))
537-
assertTrue(encoder.writeString(field2Nr, field2Str))
536+
encoder.writeString(field1Nr, field1Str)
537+
encoder.writeString(field2Nr, field2Str)
538538
encoder.flush()
539539

540540
WireDecoder(buffer).use { decoder ->
@@ -557,7 +557,7 @@ class WireCodecTest {
557557
val buffer = Buffer()
558558

559559
val encoder = WireEncoder(buffer)
560-
assertTrue(encoder.writeString(1, ""))
560+
encoder.writeString(1, "")
561561
encoder.flush()
562562

563563
val decoder = WireDecoder(buffer)
@@ -577,7 +577,7 @@ class WireCodecTest {
577577
val buffer = Buffer()
578578

579579
val encoder = WireEncoder(buffer)
580-
assertTrue(encoder.writeBytes(1, ByteArray(0)))
580+
encoder.writeBytes(1, ByteArray(0))
581581
encoder.flush()
582582

583583
val decoder = WireDecoder(buffer)
@@ -599,7 +599,7 @@ class WireCodecTest {
599599

600600
val bytes = ByteArray(1000000) { it.toByte() }
601601

602-
assertTrue(encoder.writeBytes(1, bytes))
602+
encoder.writeBytes(1, bytes)
603603
encoder.flush()
604604

605605
val decoder = WireDecoder(buffer)
@@ -624,7 +624,7 @@ class WireCodecTest {
624624
val buffer = Buffer()
625625

626626
val encoder = WireEncoder(buffer)
627-
assertTrue(encoder.writeDouble(fieldNr, testValue))
627+
encoder.writeDouble(fieldNr, testValue)
628628
encoder.flush()
629629

630630
val decoder = WireDecoder(buffer)
@@ -649,7 +649,7 @@ class WireCodecTest {
649649
val buffer = Buffer()
650650

651651
val encoder = WireEncoder(buffer)
652-
assertTrue(encoder.writeFloat(fieldNr, testValue))
652+
encoder.writeFloat(fieldNr, testValue)
653653
encoder.flush()
654654

655655
val decoder = WireDecoder(buffer)
@@ -669,12 +669,12 @@ class WireCodecTest {
669669

670670
private fun <T> runPackedFixedTest(
671671
list: List<T>,
672-
write: WireEncoder.(Int, List<T>) -> Boolean,
672+
write: WireEncoder.(Int, List<T>) -> Unit,
673673
read: WireDecoder.() -> List<T>?,
674674
) {
675675
val buf = Buffer()
676676
with(WireEncoder(buf)) {
677-
assertTrue(write(1, list))
677+
write(1, list)
678678
flush()
679679
}
680680
WireDecoder(buf).use { dec ->
@@ -733,12 +733,12 @@ class WireCodecTest {
733733
private fun <T> runPackedVarTest(
734734
list: List<T>,
735735
sizeFn: (List<T>) -> Int,
736-
write: WireEncoder.(Int, List<T>, Int) -> Boolean,
736+
write: WireEncoder.(Int, List<T>, Int) -> Unit,
737737
read: WireDecoder.() -> List<T>?,
738738
) {
739739
val buf = Buffer()
740740
with(WireEncoder(buf)) {
741-
assertTrue(write(1, list, sizeFn(list)))
741+
write(1, list, sizeFn(list))
742742
flush()
743743
}
744744
WireDecoder(buf).use { dec ->

0 commit comments

Comments
 (0)