Skip to content

Commit d69855e

Browse files
Jozott00Jozott00
committed
protobuf: Fix proto2 compilation
Signed-off-by: Johannes Zottele <[email protected]>
1 parent d7e8271 commit d69855e

File tree

7 files changed

+110
-18
lines changed

7 files changed

+110
-18
lines changed

‎protobuf/protobuf-core/src/commonMain/kotlin/kotlinx/rpc/protobuf/internal/ProtobufException.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
package kotlinx.rpc.protobuf.internal
66

7+
import kotlinx.rpc.internal.utils.InternalRpcApi
8+
79
public sealed class ProtobufException : RuntimeException {
810
protected constructor(message: String, cause: Throwable? = null) : super(message, cause)
911
}
@@ -13,6 +15,7 @@ public class ProtobufDecodingException : ProtobufException {
1315
public constructor(message: String, cause: Throwable? = null) : super(message, cause)
1416

1517
public companion object Companion {
18+
@InternalRpcApi
1619
public fun missingRequiredField(messageName: String, fieldName: String): ProtobufDecodingException =
1720
ProtobufDecodingException("Message '$messageName' is missing a required field: $fieldName")
1821

‎protobuf/protobuf-core/src/commonTest/kotlin/kotlinx/rpc/protobuf/test/ProtosTest.kt‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,29 @@ import kotlinx.rpc.protobuf.input.stream.asInputStream
1818
import kotlinx.rpc.protobuf.input.stream.asSource
1919
import kotlinx.rpc.protobuf.internal.ProtobufDecodingException
2020
import kotlinx.rpc.protobuf.internal.WireEncoder
21-
import test.nested.*
21+
import test.groups.WithGroups
22+
import test.groups.WithGroupsInternal
23+
import test.groups.invoke
24+
import test.nested.NestedOuter
25+
import test.nested.NestedOuterInternal
26+
import test.nested.NotInside
27+
import test.nested.NotInsideInternal
2228
import test.nested.invoke
2329
import test.recursive.Recursive
2430
import test.recursive.RecursiveInternal
2531
import test.recursive.RecursiveReq
2632
import test.recursive.invoke
27-
import test.submsg.*
33+
import test.submsg.Other
34+
import test.submsg.OtherInternal
35+
import test.submsg.ReferenceInternal
36+
import test.submsg.encodeWith
2837
import test.submsg.invoke
29-
import kotlin.collections.iterator
30-
import kotlin.test.*
38+
import kotlin.test.Test
39+
import kotlin.test.assertEquals
40+
import kotlin.test.assertFailsWith
41+
import kotlin.test.assertIs
42+
import kotlin.test.assertNull
43+
import kotlin.test.assertTrue
3144

3245
class ProtosTest {
3346

@@ -411,4 +424,33 @@ class ProtosTest {
411424
}
412425
}
413426

427+
@Test
428+
fun testGroup() {
429+
val msg = WithGroups {
430+
firstgroup = WithGroups.FirstGroup {
431+
value = 23u
432+
}
433+
secondgroup = listOf(
434+
WithGroups.SecondGroup {
435+
value = "First Item"
436+
}, WithGroups.SecondGroup {
437+
value = "Second Item"
438+
}
439+
)
440+
oneOfWithGroup = WithGroups.OneOfWithGroup.Testgroup(WithGroups.TestGroup {
441+
value = 42u
442+
})
443+
}
444+
445+
val decoded = encodeDecode(msg, WithGroupsInternal.CODEC)
446+
assertEquals(msg.firstgroup.value, decoded.firstgroup.value)
447+
for ((i, group) in msg.secondgroup.withIndex()) {
448+
assertEquals(group.value, decoded.secondgroup[i].value)
449+
}
450+
assertTrue(decoded.oneOfWithGroup is WithGroups.OneOfWithGroup.Testgroup)
451+
assertEquals(
452+
(msg.oneOfWithGroup as WithGroups.OneOfWithGroup.Testgroup).value.value,
453+
(decoded.oneOfWithGroup as WithGroups.OneOfWithGroup.Testgroup).value.value
454+
)
455+
}
414456
}

‎protobuf/protobuf-core/src/commonTest/proto/test_map.proto‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
syntax = "proto3";
1+
//syntax = "proto3";
22

33
package kotlinx.rpc.protobuf.test;
44

@@ -7,4 +7,5 @@ import "presence_check.proto";
77
message TestMap {
88
map<string, int64> primitives = 1;
99
map<int32, kotlinx.rpc.protobuf.test.PresenceCheck> messages = 2;
10+
map<int32, int32> map_int32_int32 = 3;
1011
}

‎protoc-gen/common/src/main/kotlin/kotlinx/rpc/protoc/gen/core/model/model.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,14 @@ data class FieldDeclaration(
8484

8585
val isPartOfOneof: Boolean = dec.realContainingOneof != null
8686

87+
val isPartOfMapEntry = dec.containingType.options.mapEntry
88+
8789
// aligns with edition settings and backward compatibility with proto2 and proto3
8890
val nullable: Boolean = (dec.hasPresence() && !dec.isRequired && !dec.hasDefaultValue()
8991
&& !dec.isRepeated // repeated fields cannot be nullable (just empty)
9092
&& !isPartOfOneof // upper conditions would match oneof inner fields
9193
&& type !is FieldType.Message // messages must not be null (to conform protobuf standards)
94+
&& !isPartOfMapEntry // map entry fields cannot be null
9295
)
9396
|| type is FieldType.OneOf // all OneOf fields are nullable
9497
val number: Int = dec.number

‎protoc-gen/protobuf/src/main/kotlin/kotlinx/rpc/protoc/gen/ModelToProtobufKotlinCommonGenerator.kt‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -862,25 +862,53 @@ class ModelToProtobufKotlinCommonGenerator(
862862
return type.defaultValue ?: error("No default value for field $name")
863863
}
864864

865-
return when (val value = dec.defaultValue) {
866-
is String -> {
865+
val value = dec.defaultValue
866+
return when {
867+
value is String -> {
867868
"\"$value\""
868869
}
869870

870-
is ByteString -> {
871+
value is ByteString -> {
871872
"BytesDefaults.$name"
872873
}
873874

874-
is Descriptors.EnumValueDescriptor -> {
875+
value is Descriptors.EnumValueDescriptor -> {
875876
value.fqName().safeFullName()
876877
}
877878

879+
value is Int && (type == FieldType.IntegralType.UINT32 || type == FieldType.IntegralType.FIXED32) -> {
880+
Integer.toUnsignedString(value) + "u"
881+
}
882+
883+
value is Long && (type == FieldType.IntegralType.UINT64 || type == FieldType.IntegralType.FIXED64) -> {
884+
java.lang.Long.toUnsignedString(value) + "uL"
885+
}
886+
887+
value is Float -> {
888+
when (value.toString()) {
889+
"Infinity" -> "Float.POSITIVE_INFINITY"
890+
"-Infinity" -> "Float.NEGATIVE_INFINITY"
891+
"NaN" -> "Float.NaN"
892+
else -> value.toString() + "f"
893+
}
894+
}
895+
896+
value is Double -> {
897+
when (value.toString()) {
898+
"Infinity" -> "Double.POSITIVE_INFINITY"
899+
"-Infinity" -> "Double.NEGATIVE_INFINITY"
900+
"NaN" -> "Double.NaN"
901+
else -> value.toString()
902+
}
903+
}
904+
878905
else -> {
879906
"${value}${type.scalarDefaultSuffix()}"
880907
}
881908
}
882909
}
883910

911+
884912
private fun FieldType.decodeEncodeFuncName(): String? = when (this) {
885913
FieldType.IntegralType.STRING -> "String"
886914
FieldType.IntegralType.BYTES -> "Bytes"

‎tests/protobuf-conformance/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ tasks.withType<BufGenerateTask>().configureEach {
5151
protoSourceSets {
5252
main {
5353
proto {
54-
exclude("**/test_messages_proto2.proto")
54+
// exclude("**/test_messages_proto2.proto")
5555
exclude("**/test_messages_proto2_editions.proto")
5656
exclude("**/test_messages_edition2023.proto")
5757
}
@@ -91,7 +91,8 @@ val generateConformanceTests = tasks.register<JavaExec>("generateConformanceTest
9191
}
9292

9393
val conformanceTest = properties.getOrDefault("conformance.test", "").toString()
94-
val conformanceTestDebug = properties.getOrDefault("conformance.test.debug", "false").toString().toBooleanStrictOrNull() ?: false
94+
val conformanceTestDebug =
95+
properties.getOrDefault("conformance.test.debug", "false").toString().toBooleanStrictOrNull() ?: false
9596

9697
val generateConformanceFileDescriptorSet = tasks
9798
.withType<GenerateConformanceFileDescriptorSet>()

‎tests/protobuf-conformance/src/test/kotlin/kotlinx/rpc/protoc/gen/test/ConformanceTest.kt‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import kotlinx.rpc.protoc.gen.test.runner.createConformanceTestFiles
99
import kotlinx.rpc.protoc.gen.test.runner.execConformanceTestRunner
1010
import kotlinx.rpc.protoc.gen.test.runner.getJavaClient
1111
import org.junit.jupiter.api.DynamicTest
12+
import org.junit.jupiter.api.Test
1213
import org.junit.jupiter.api.TestFactory
1314
import org.junit.jupiter.api.TestInstance
1415
import org.junit.jupiter.api.fail
@@ -60,25 +61,38 @@ class ConformanceTest {
6061
val mockDir = Path(CONFORMANCE_OUTPUT_DIR).resolve("mock")
6162
val (baselineFile, _) = createConformanceTestFiles(mockDir, createBlank = false)
6263

64+
// Include only Editions_Proto3 or Proto3 tests and exclude any JSON-related tests
65+
fun includeTest(name: String): Boolean {
66+
val trimmed = name.substringBefore('#').trim()
67+
if (trimmed.isEmpty()) return false
68+
val isProto3Edition = trimmed.contains(".Editions_Proto3.") || trimmed.contains(".Proto3.")
69+
|| trimmed.contains(".Proto2.")
70+
val isJsonRelated = trimmed.contains(".Json") // matches JsonInput, JsonOutput, etc.
71+
return isProto3Edition && !isJsonRelated
72+
}
73+
6374
val baseline = baselineFile
6475
.readLines()
6576
.map { it.substringBefore('#').trim() }
6677
.filter { it.isNotEmpty() }
78+
.filter { includeTest(it) }
6779
.toSet()
6880

69-
val fails = failingTestsFile.readLines().associate {
70-
it.substringBefore('#').trim() to it.substringAfter('#').trim()
71-
}
81+
val fails = failingTestsFile.readLines()
82+
.map { it to (it.substringAfter('#', missingDelimiterValue = "").trim()) }
83+
.map { (line, msg) -> line.substringBefore('#').trim() to msg }
84+
.filter { (name, _) -> includeTest(name) }
85+
.toMap()
7286

7387
val passed = baseline - fails.keys
7488

7589
println(
7690
"""
7791
78-
=== Conformance Test Results ===
79-
Total baseline tests: ${baseline.size}
80-
[+] Passed tests: ${passed.size}
81-
[-] Failed tests: ${fails.size}
92+
=== Conformance Test Results (filtered) ===
93+
Total baseline tests (filtered): ${baseline.size}
94+
[+] Passed tests: ${passed.size}
95+
[-] Failed tests: ${fails.size}
8296
""".trimIndent()
8397
)
8498

0 commit comments

Comments
 (0)