protobuf: Fix proto2 compilation

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

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

@@ -4,6 +4,8 @@
 
 package kotlinx.rpc.protobuf.internal
 
+import kotlinx.rpc.internal.utils.InternalRpcApi
+
 public sealed class ProtobufException : RuntimeException {
     protected constructor(message: String, cause: Throwable? = null) : super(message, cause)
 }
@@ -13,6 +15,7 @@ public class ProtobufDecodingException : ProtobufException {
     public constructor(message: String, cause: Throwable? = null) : super(message, cause)
 
     public companion object Companion {
+        @InternalRpcApi
         public fun missingRequiredField(messageName: String, fieldName: String): ProtobufDecodingException =
             ProtobufDecodingException("Message '$messageName' is missing a required field: $fieldName")
 

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

@@ -453,4 +453,10 @@ class ProtosTest {
             (decoded.oneOfWithGroup as WithGroups.OneOfWithGroup.Testgroup).value.value
         )
     }
+
+    @Test
+    fun test() {
+        println("Float printed: ${Float.NEGATIVE_INFINITY}")
+    }
+
 }

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

@@ -1,4 +1,4 @@
-syntax = "proto3";
+//syntax = "proto3";
 
 package kotlinx.rpc.protobuf.test;
 
@@ -7,4 +7,5 @@ import "presence_check.proto";
 message TestMap {
   map<string, int64> primitives = 1;
   map<int32, kotlinx.rpc.protobuf.test.PresenceCheck> messages = 2;
+  map<int32, int32> map_int32_int32 = 3;
 }

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

@@ -91,11 +91,14 @@ data class FieldDeclaration(
 
     val isPartOfOneof: Boolean = dec.realContainingOneof != null
 
+    val isPartOfMapEntry = dec.containingType.options.mapEntry
+
     // aligns with edition settings and backward compatibility with proto2 and proto3
     val nullable: Boolean = (dec.hasPresence() && !dec.isRequired && !dec.hasDefaultValue()
             && !dec.isRepeated // repeated fields cannot be nullable (just empty)
             && !isPartOfOneof // upper conditions would match oneof inner fields
             && type !is FieldType.Message // messages must not be null (to conform protobuf standards)
+            && !isPartOfMapEntry // map entry fields cannot be null
             )
             || type is FieldType.OneOf // all OneOf fields are nullable
     val number: Int = dec.number

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

@@ -911,25 +911,53 @@ class ModelToProtobufKotlinCommonGenerator(
             return type.defaultValue ?: error("No default value for field $name")
         }
 
-        return when (val value = dec.defaultValue) {
-            is String -> {
+        val value = dec.defaultValue
+        return when {
+            value is String -> {
                 "\"$value\""
             }
 
-            is ByteString -> {
+            value is ByteString -> {
                 "BytesDefaults.$name"
             }
 
-            is Descriptors.EnumValueDescriptor -> {
+            value is Descriptors.EnumValueDescriptor -> {
                 value.fqName().safeFullName()
             }
 
+            value is Int && (type == FieldType.IntegralType.UINT32 || type == FieldType.IntegralType.FIXED32) -> {
+                Integer.toUnsignedString(value) + "u"
+            }
+
+            value is Long && (type == FieldType.IntegralType.UINT64 || type == FieldType.IntegralType.FIXED64) -> {
+                java.lang.Long.toUnsignedString(value) + "uL"
+            }
+
+            value is Float -> {
+                when (value.toString()) {
+                    "Infinity" -> "Float.POSITIVE_INFINITY"
+                    "-Infinity" -> "Float.NEGATIVE_INFINITY"
+                    "NaN" -> "Float.NaN"
+                    else -> value.toString() + "f"
+                }
+            }
+
+            value is Double -> {
+                when (value.toString()) {
+                    "Infinity" -> "Double.POSITIVE_INFINITY"
+                    "-Infinity" -> "Double.NEGATIVE_INFINITY"
+                    "NaN" -> "Double.NaN"
+                    else -> value.toString()
+                }
+            }
+
             else -> {
                 "${value}${type.scalarDefaultSuffix()}"
             }
         }
     }
 
+
     private fun FieldType.decodeEncodeFuncName(): String? = when (this) {
         FieldType.IntegralType.STRING -> "String"
         FieldType.IntegralType.BYTES -> "Bytes"

tests/protobuf-conformance/build.gradle.kts

@@ -51,7 +51,7 @@ tasks.withType<BufGenerateTask>().configureEach {
 protoSourceSets {
     main {
         proto {
-            exclude("**/test_messages_proto2.proto")
+//            exclude("**/test_messages_proto2.proto")
             exclude("**/test_messages_proto2_editions.proto")
             exclude("**/test_messages_edition2023.proto")
         }
@@ -91,7 +91,8 @@ val generateConformanceTests = tasks.register<JavaExec>("generateConformanceTest
 }
 
 val conformanceTest = properties.getOrDefault("conformance.test", "").toString()
-val conformanceTestDebug = properties.getOrDefault("conformance.test.debug", "false").toString().toBooleanStrictOrNull() ?: false
+val conformanceTestDebug =
+    properties.getOrDefault("conformance.test.debug", "false").toString().toBooleanStrictOrNull() ?: false
 
 val generateConformanceFileDescriptorSet = tasks
     .withType<GenerateConformanceFileDescriptorSet>()

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

@@ -9,6 +9,7 @@ import kotlinx.rpc.protoc.gen.test.runner.createConformanceTestFiles
 import kotlinx.rpc.protoc.gen.test.runner.execConformanceTestRunner
 import kotlinx.rpc.protoc.gen.test.runner.getJavaClient
 import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestFactory
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
@@ -60,25 +61,38 @@ class ConformanceTest {
         val mockDir = Path(CONFORMANCE_OUTPUT_DIR).resolve("mock")
         val (baselineFile, _) = createConformanceTestFiles(mockDir, createBlank = false)
 
+        // Include only Editions_Proto3 or Proto3 tests and exclude any JSON-related tests
+        fun includeTest(name: String): Boolean {
+            val trimmed = name.substringBefore('#').trim()
+            if (trimmed.isEmpty()) return false
+            val isProto3Edition = trimmed.contains(".Editions_Proto3.") || trimmed.contains(".Proto3.")
+                    || trimmed.contains(".Proto2.")
+            val isJsonRelated = trimmed.contains(".Json") // matches JsonInput, JsonOutput, etc.
+            return isProto3Edition && !isJsonRelated
+        }
+
         val baseline = baselineFile
             .readLines()
             .map { it.substringBefore('#').trim() }
             .filter { it.isNotEmpty() }
+            .filter { includeTest(it) }
             .toSet()
 
-        val fails = failingTestsFile.readLines().associate {
-            it.substringBefore('#').trim() to it.substringAfter('#').trim()
-        }
+        val fails = failingTestsFile.readLines()
+            .map { it to (it.substringAfter('#', missingDelimiterValue = "").trim()) }
+            .map { (line, msg) -> line.substringBefore('#').trim() to msg }
+            .filter { (name, _) -> includeTest(name) }
+            .toMap()
 
         val passed = baseline - fails.keys
 
         println(
             """
                 
-                === Conformance Test Results ===
-                Total baseline tests:   ${baseline.size}
-                [+] Passed tests:       ${passed.size}
-                [-] Failed tests:       ${fails.size}
+                === Conformance Test Results (filtered) ===
+                Total baseline tests (filtered):   ${baseline.size}
+                [+] Passed tests:                  ${passed.size}
+                [-] Failed tests:                  ${fails.size}
             """.trimIndent()
         )