BEGIN_PUBLIC

Support static method access via FooBarCompanion.shared
END_PUBLIC

PiperOrigin-RevId: 817617303

Author: stefanhaustein

protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc

@@ -212,7 +212,7 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
         "\n"
         "@class $classname$;"
         "\n"
-        "@protocol $classname$_Companion\n"
+        "@protocol $classname$Companion\n"
         "- (nonnull $classname$_Builder *)newBuilder OBJC_METHOD_FAMILY_NONE;\n"
         "- (nonnull $classname$ *)getDefaultInstance;\n"
         "- (nonnull $classname$ *)parseFromWithComGoogleProtobufByteString:"
@@ -224,7 +224,9 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
         "// in j2objc_message.cc \n"
         "@interface $classname$ : $superclassname$<$classname$OrBuilder>\n\n"
         "@property (nonnull, readonly, class)"
-        " id<$classname$_Companion> companion;\n",
+        " id<$classname$Companion> companion;\n"
+        "@property (nonnull, readonly, class)"
+        " id<$classname$Companion> shared;\n",
         "classname", ClassName(descriptor_), "superclassname", superclassName);
   } else {
     printer->Print(
@@ -440,8 +442,11 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {
 
   if (IsGenerateProperties(descriptor_->file())) {
     printer->Print(
-        "+ (nonnull id<$classname$_Companion>)companion {\n"
-        "  return (id<$classname$_Companion>) [self class];\n"
+        "+ (nonnull id<$classname$Companion>)shared {\n"
+        "  return (id<$classname$Companion>) [self class];\n"
+        "}\n"
+        "+ (nonnull id<$classname$Companion>)companion {\n"
+        "  return (id<$classname$Companion>) [self class];\n"
         "}\n",
         "classname", ClassName(descriptor_));
     for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {