Skip to content

Commit 8f1a7dc

Browse files
committed
grpc-pb: Address PR comments
Signed-off-by: Johannes Zottele <[email protected]>
1 parent 498d20a commit 8f1a7dc

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

grpc/grpc-core/src/commonTest/proto/enum.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ enum Enum {
1414
message UsingEnum {
1515
Enum enum = 1;
1616
}
17-

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,10 @@ class ModelToKotlinCommonGenerator(
438438

439439

440440
private fun FieldDeclaration.wireSizeCall(variable: String): String {
441+
val sizeFunName =
442+
type.decodeEncodeFuncName()?.decapitalize() ?: error("No decodeEncodeFuncName for type: $type")
441443
val sizeFunc =
442-
"$PB_PKG.WireSize.${type.decodeEncodeFuncName()!!.decapitalize()}($variable)"
444+
"$PB_PKG.WireSize.$sizeFunName($variable)"
443445
return when (val fieldType = type) {
444446
is FieldType.IntegralType -> when {
445447
fieldType.wireType == WireType.FIXED32 -> "32"
@@ -604,12 +606,12 @@ class ModelToKotlinCommonGenerator(
604606
declaration.aliases.forEach { alias: EnumDeclaration.Alias ->
605607
code(
606608
"val ${alias.name.simpleName}: $className " +
607-
"= ${alias.original.name.simpleName}"
609+
"get() = ${alias.original.name.simpleName}"
608610
)
609611
}
610612

611613
val entryNamesSorted = entriesSorted.joinToString(", ") { it.name.simpleName }
612-
code("val entries: List<$className> = listOf($entryNamesSorted)")
614+
code("val entries: Lazy<List<$className>> = lazy { listOf($entryNamesSorted) }")
613615
}
614616
}
615617
}

0 commit comments

Comments
 (0)