Skip to content

Commit b733ebc

Browse files
committed
grpc-pb: Make generated methods internal
Signed-off-by: Johannes Zottele <[email protected]>
1 parent 9e32cbb commit b733ebc

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,13 @@ open class CodeGenerator(
177177
typeParameters: String = "",
178178
args: String = "",
179179
contextReceiver: String = "",
180+
annotations: List<String> = emptyList(),
180181
returnType: String = "",
181182
block: (CodeGenerator.() -> Unit)? = null,
182183
) {
184+
for (annotation in annotations) {
185+
addLine(annotation)
186+
}
183187
val modifiersString = if (modifiers.isEmpty()) "" else "$modifiers "
184188
val contextString = if (contextReceiver.isEmpty()) "" else "$contextReceiver."
185189
val returnTypeString = if (returnType.isEmpty()) "" else ": $returnType"

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ class ModelToKotlinCommonGenerator(
261261
name = "decodeWith",
262262
modifiers = "internal",
263263
args = "msg: ${declaration.internalClassFullName()}, decoder: $PB_PKG.WireDecoder",
264+
annotations = listOf("@$INTERNAL_RPC_API_ANNO"),
264265
contextReceiver = "${declaration.internalClassFullName()}.Companion"
265266
) {
266267
whileBlock("!decoder.hadError()") {
@@ -382,6 +383,7 @@ class ModelToKotlinCommonGenerator(
382383
private fun CodeGenerator.generateMessageEncoder(declaration: MessageDeclaration) = function(
383384
name = "encodeWith",
384385
modifiers = "internal",
386+
annotations = listOf("@$INTERNAL_RPC_API_ANNO"),
385387
args = "encoder: $PB_PKG.WireEncoder",
386388
contextReceiver = declaration.internalClassFullName(),
387389
) {
@@ -460,8 +462,9 @@ class ModelToKotlinCommonGenerator(
460462
private fun CodeGenerator.generateInternalEnumConstructor(enum: EnumDeclaration) {
461463
function(
462464
"fromNumber",
463-
modifiers = "private",
465+
modifiers = "internal",
464466
args = "number: Int",
467+
annotations = listOf("@$INTERNAL_RPC_API_ANNO"),
465468
contextReceiver = "${enum.name.safeFullName()}.Companion",
466469
returnType = enum.name.safeFullName(),
467470
) {
@@ -483,7 +486,8 @@ class ModelToKotlinCommonGenerator(
483486
*/
484487
private fun CodeGenerator.generateRequiredCheck(declaration: MessageDeclaration) = function(
485488
name = "checkRequiredFields",
486-
modifiers = "private",
489+
modifiers = "internal",
490+
annotations = listOf("@$INTERNAL_RPC_API_ANNO"),
487491
contextReceiver = declaration.internalClassFullName(),
488492
) {
489493
val requiredFields = declaration.actualFields.filter { it.dec.isRequired }
@@ -538,7 +542,8 @@ class ModelToKotlinCommonGenerator(
538542
private fun CodeGenerator.generateInternalCastExtension(declaration: MessageDeclaration) {
539543
function(
540544
"asInternal",
541-
modifiers = "private",
545+
modifiers = "internal",
546+
annotations = listOf("@$INTERNAL_RPC_API_ANNO"),
542547
contextReceiver = declaration.name.safeFullName(),
543548
returnType = declaration.internalClassFullName(),
544549
) {

0 commit comments

Comments
 (0)