Skip to content

Commit 7268e2f

Browse files
deannagarciadeannagarcia
authored
Merge pull request #11068 from deannagarcia/21.x
Add public modifiers to kotlin code
2 parents eb06d1f + 7845696 commit 7268e2f

12 files changed

+144
-144
lines changed

‎src/google/protobuf/compiler/java/enum_field.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ void ImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
277277
io::Printer* printer) const {
278278
WriteFieldDocComment(printer, descriptor_);
279279
printer->Print(variables_,
280-
"$kt_deprecation$ var $kt_name$: $kt_type$\n"
280+
"$kt_deprecation$public var $kt_name$: $kt_type$\n"
281281
" @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
282282
" get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
283283
" @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
@@ -288,15 +288,15 @@ void ImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
288288
WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
289289
/* builder */ false);
290290
printer->Print(variables_,
291-
"fun ${$clear$kt_capitalized_name$$}$() {\n"
291+
"public fun ${$clear$kt_capitalized_name$$}$() {\n"
292292
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
293293
"}\n");
294294

295295
if (HasHazzer(descriptor_)) {
296296
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
297297
printer->Print(
298298
variables_,
299-
"fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
299+
"public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
300300
" return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
301301
"}\n");
302302
}
@@ -1054,12 +1054,12 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
10541054
" */\n"
10551055
"@kotlin.OptIn"
10561056
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
1057-
"class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
1057+
"public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
10581058
" : com.google.protobuf.kotlin.DslProxy()\n");
10591059

10601060
WriteFieldDocComment(printer, descriptor_);
10611061
printer->Print(variables_,
1062-
"$kt_deprecation$ val $kt_name$: "
1062+
"$kt_deprecation$public val $kt_name$: "
10631063
"com.google.protobuf.kotlin.DslList"
10641064
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
10651065
" @kotlin.jvm.JvmSynthetic\n"
@@ -1072,7 +1072,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
10721072
printer->Print(variables_,
10731073
"@kotlin.jvm.JvmSynthetic\n"
10741074
"@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
1075-
"fun com.google.protobuf.kotlin.DslList"
1075+
"public fun com.google.protobuf.kotlin.DslList"
10761076
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
10771077
"add(value: $kt_type$) {\n"
10781078
" $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
@@ -1084,7 +1084,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
10841084
"@kotlin.jvm.JvmSynthetic\n"
10851085
"@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
10861086
"@Suppress(\"NOTHING_TO_INLINE\")\n"
1087-
"inline operator fun com.google.protobuf.kotlin.DslList"
1087+
"public inline operator fun com.google.protobuf.kotlin.DslList"
10881088
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
10891089
"plusAssign(value: $kt_type$) {\n"
10901090
" add(value)\n"
@@ -1095,7 +1095,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
10951095
printer->Print(variables_,
10961096
"@kotlin.jvm.JvmSynthetic\n"
10971097
"@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
1098-
"fun com.google.protobuf.kotlin.DslList"
1098+
"public fun com.google.protobuf.kotlin.DslList"
10991099
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
11001100
"addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
11011101
" $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
@@ -1108,7 +1108,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
11081108
"@kotlin.jvm.JvmSynthetic\n"
11091109
"@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
11101110
"@Suppress(\"NOTHING_TO_INLINE\")\n"
1111-
"inline operator fun com.google.protobuf.kotlin.DslList"
1111+
"public inline operator fun com.google.protobuf.kotlin.DslList"
11121112
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
11131113
"plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
11141114
" addAll(values)\n"
@@ -1120,7 +1120,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
11201120
variables_,
11211121
"@kotlin.jvm.JvmSynthetic\n"
11221122
"@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
1123-
"operator fun com.google.protobuf.kotlin.DslList"
1123+
"public operator fun com.google.protobuf.kotlin.DslList"
11241124
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
11251125
"set(index: kotlin.Int, value: $kt_type$) {\n"
11261126
" $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
@@ -1131,7 +1131,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
11311131
printer->Print(variables_,
11321132
"@kotlin.jvm.JvmSynthetic\n"
11331133
"@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
1134-
"fun com.google.protobuf.kotlin.DslList"
1134+
"public fun com.google.protobuf.kotlin.DslList"
11351135
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
11361136
"clear() {\n"
11371137
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"

‎src/google/protobuf/compiler/java/enum_field_lite.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void ImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
288288
io::Printer* printer) const {
289289
WriteFieldDocComment(printer, descriptor_);
290290
printer->Print(variables_,
291-
"$kt_deprecation$var $kt_name$: $kt_type$\n"
291+
"$kt_deprecation$public var $kt_name$: $kt_type$\n"
292292
" @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
293293
" get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
294294
" @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
@@ -299,15 +299,15 @@ void ImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
299299
WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
300300
/* builder */ false);
301301
printer->Print(variables_,
302-
"fun ${$clear$kt_capitalized_name$$}$() {\n"
302+
"public fun ${$clear$kt_capitalized_name$$}$() {\n"
303303
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
304304
"}\n");
305305

306306
if (HasHazzer(descriptor_)) {
307307
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
308308
printer->Print(
309309
variables_,
310-
"fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
310+
"public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
311311
" return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
312312
"}\n");
313313
}
@@ -827,12 +827,12 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
827827
" */\n"
828828
"@kotlin.OptIn"
829829
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
830-
"class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
830+
"public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
831831
" : com.google.protobuf.kotlin.DslProxy()\n");
832832

833833
WriteFieldDocComment(printer, descriptor_);
834834
printer->Print(variables_,
835-
"$kt_deprecation$ val $kt_name$: "
835+
"$kt_deprecation$ public val $kt_name$: "
836836
"com.google.protobuf.kotlin.DslList"
837837
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
838838
" @kotlin.jvm.JvmSynthetic\n"
@@ -845,7 +845,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
845845
printer->Print(variables_,
846846
"@kotlin.jvm.JvmSynthetic\n"
847847
"@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
848-
"fun com.google.protobuf.kotlin.DslList"
848+
"public fun com.google.protobuf.kotlin.DslList"
849849
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
850850
"add(value: $kt_type$) {\n"
851851
" $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
@@ -857,7 +857,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
857857
"@kotlin.jvm.JvmSynthetic\n"
858858
"@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
859859
"@Suppress(\"NOTHING_TO_INLINE\")\n"
860-
"inline operator fun com.google.protobuf.kotlin.DslList"
860+
"public inline operator fun com.google.protobuf.kotlin.DslList"
861861
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
862862
"plusAssign(value: $kt_type$) {\n"
863863
" add(value)\n"
@@ -868,7 +868,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
868868
printer->Print(variables_,
869869
"@kotlin.jvm.JvmSynthetic\n"
870870
"@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
871-
"fun com.google.protobuf.kotlin.DslList"
871+
"public fun com.google.protobuf.kotlin.DslList"
872872
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
873873
"addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
874874
" $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
@@ -881,7 +881,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
881881
"@kotlin.jvm.JvmSynthetic\n"
882882
"@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
883883
"@Suppress(\"NOTHING_TO_INLINE\")\n"
884-
"inline operator fun com.google.protobuf.kotlin.DslList"
884+
"public inline operator fun com.google.protobuf.kotlin.DslList"
885885
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
886886
"plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
887887
" addAll(values)\n"
@@ -893,7 +893,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
893893
variables_,
894894
"@kotlin.jvm.JvmSynthetic\n"
895895
"@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
896-
"operator fun com.google.protobuf.kotlin.DslList"
896+
"public operator fun com.google.protobuf.kotlin.DslList"
897897
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
898898
"set(index: kotlin.Int, value: $kt_type$) {\n"
899899
" $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
@@ -904,7 +904,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
904904
printer->Print(variables_,
905905
"@kotlin.jvm.JvmSynthetic\n"
906906
"@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
907-
"fun com.google.protobuf.kotlin.DslList"
907+
"public fun com.google.protobuf.kotlin.DslList"
908908
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
909909
"clear() {\n"
910910
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"

‎src/google/protobuf/compiler/java/map_field.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,13 +735,13 @@ void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
735735
" */\n"
736736
"@kotlin.OptIn"
737737
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
738-
"class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
738+
"public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
739739
" : com.google.protobuf.kotlin.DslProxy()\n");
740740

741741
WriteFieldDocComment(printer, descriptor_);
742742
printer->Print(
743743
variables_,
744-
"$kt_deprecation$ val $kt_name$: "
744+
"$kt_deprecation$ public val $kt_name$: "
745745
"com.google.protobuf.kotlin.DslMap"
746746
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
747747
" @kotlin.jvm.JvmSynthetic\n"
@@ -754,7 +754,7 @@ void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
754754
printer->Print(
755755
variables_,
756756
"@JvmName(\"put$kt_capitalized_name$\")\n"
757-
"fun com.google.protobuf.kotlin.DslMap"
757+
"public fun com.google.protobuf.kotlin.DslMap"
758758
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
759759
" .put(key: $kt_key_type$, value: $kt_value_type$) {\n"
760760
" $kt_dsl_builder$.${$put$capitalized_name$$}$(key, value)\n"
@@ -766,7 +766,7 @@ void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
766766
"@kotlin.jvm.JvmSynthetic\n"
767767
"@JvmName(\"set$kt_capitalized_name$\")\n"
768768
"@Suppress(\"NOTHING_TO_INLINE\")\n"
769-
"inline operator fun com.google.protobuf.kotlin.DslMap"
769+
"public inline operator fun com.google.protobuf.kotlin.DslMap"
770770
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
771771
" .set(key: $kt_key_type$, value: $kt_value_type$) {\n"
772772
" put(key, value)\n"
@@ -777,7 +777,7 @@ void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
777777
variables_,
778778
"@kotlin.jvm.JvmSynthetic\n"
779779
"@JvmName(\"remove$kt_capitalized_name$\")\n"
780-
"fun com.google.protobuf.kotlin.DslMap"
780+
"public fun com.google.protobuf.kotlin.DslMap"
781781
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
782782
" .remove(key: $kt_key_type$) {\n"
783783
" $kt_dsl_builder$.${$remove$capitalized_name$$}$(key)\n"
@@ -788,7 +788,7 @@ void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
788788
variables_,
789789
"@kotlin.jvm.JvmSynthetic\n"
790790
"@JvmName(\"putAll$kt_capitalized_name$\")\n"
791-
"fun com.google.protobuf.kotlin.DslMap"
791+
"public fun com.google.protobuf.kotlin.DslMap"
792792
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
793793
" .putAll(map: kotlin.collections.Map<$kt_key_type$, $kt_value_type$>) "
794794
"{\n"

‎src/google/protobuf/compiler/java/map_field_lite.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -838,13 +838,13 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
838838
" */\n"
839839
"@kotlin.OptIn"
840840
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
841-
"class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
841+
"public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
842842
" : com.google.protobuf.kotlin.DslProxy()\n");
843843

844844
WriteFieldDocComment(printer, descriptor_);
845845
printer->Print(
846846
variables_,
847-
"$kt_deprecation$ val $kt_name$: "
847+
"$kt_deprecation$ public val $kt_name$: "
848848
"com.google.protobuf.kotlin.DslMap"
849849
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
850850
" @kotlin.jvm.JvmSynthetic\n"
@@ -857,7 +857,7 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
857857
printer->Print(
858858
variables_,
859859
"@JvmName(\"put$kt_capitalized_name$\")\n"
860-
"fun com.google.protobuf.kotlin.DslMap"
860+
"public fun com.google.protobuf.kotlin.DslMap"
861861
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
862862
" .put(key: $kt_key_type$, value: $kt_value_type$) {\n"
863863
" $kt_dsl_builder$.${$put$capitalized_name$$}$(key, value)\n"
@@ -869,7 +869,7 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
869869
"@kotlin.jvm.JvmSynthetic\n"
870870
"@JvmName(\"set$kt_capitalized_name$\")\n"
871871
"@Suppress(\"NOTHING_TO_INLINE\")\n"
872-
"inline operator fun com.google.protobuf.kotlin.DslMap"
872+
"public inline operator fun com.google.protobuf.kotlin.DslMap"
873873
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
874874
" .set(key: $kt_key_type$, value: $kt_value_type$) {\n"
875875
" put(key, value)\n"
@@ -880,7 +880,7 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
880880
variables_,
881881
"@kotlin.jvm.JvmSynthetic\n"
882882
"@JvmName(\"remove$kt_capitalized_name$\")\n"
883-
"fun com.google.protobuf.kotlin.DslMap"
883+
"public fun com.google.protobuf.kotlin.DslMap"
884884
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
885885
" .remove(key: $kt_key_type$) {\n"
886886
" $kt_dsl_builder$.${$remove$capitalized_name$$}$(key)\n"
@@ -891,7 +891,7 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
891891
variables_,
892892
"@kotlin.jvm.JvmSynthetic\n"
893893
"@JvmName(\"putAll$kt_capitalized_name$\")\n"
894-
"fun com.google.protobuf.kotlin.DslMap"
894+
"public fun com.google.protobuf.kotlin.DslMap"
895895
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
896896
" .putAll(map: kotlin.collections.Map<$kt_key_type$, $kt_value_type$>) "
897897
"{\n"
@@ -903,7 +903,7 @@ void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
903903
variables_,
904904
"@kotlin.jvm.JvmSynthetic\n"
905905
"@JvmName(\"clear$kt_capitalized_name$\")\n"
906-
"fun com.google.protobuf.kotlin.DslMap"
906+
"public fun com.google.protobuf.kotlin.DslMap"
907907
"<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
908908
" .clear() {\n"
909909
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"

0 commit comments

Comments
 (0)