commit f1a939fb69504ff4e1fe386978165faa37fb2979
author Thomas Van Lenten <thomasvl@google.com> Fri Sep 23 13:46:22 2022 -0400
committer Thomas Van Lenten <thomasvl@google.com> Fri Sep 23 20:51:08 2022 -0400
tree dd2f3c51d7af0a276e7cd8836189f98746da586e
parent 391cc7b355da07851f2c370e08497c47262c2ef9

Add an objc_class_prefix for the proto2 syntax file used in conformance tests.

Not all the types have "Proto2" on the end, so for uniformity put an
objc_class_prefix like was done for the proto3 syntax file.

conformance/conformance_objc.m

diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m
index ab751c8..12f06c9 100644
--- a/conformance/conformance_objc.m
+++ b/conformance/conformance_objc.m
@@ -77,7 +77,7 @@
       if ([request.messageType isEqual:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) {
         msgClass = [Proto3TestAllTypesProto3 class];
       } else if ([request.messageType isEqual:@"protobuf_test_messages.proto2.TestAllTypesProto2"]) {
-        msgClass = [TestAllTypesProto2 class];
+        msgClass = [Proto2TestAllTypesProto2 class];
       } else {
         response.runtimeError =
             [NSString stringWithFormat:@"Protobuf request had an unknown message_type: %@",

src/google/protobuf/test_messages_proto2.proto

diff --git a/src/google/protobuf/test_messages_proto2.proto b/src/google/protobuf/test_messages_proto2.proto
index b04d8bb..73bd626 100644
--- a/src/google/protobuf/test_messages_proto2.proto
+++ b/src/google/protobuf/test_messages_proto2.proto
@@ -40,6 +40,7 @@
 package protobuf_test_messages.proto2;
 
 option java_package = "com.google.protobuf_test_messages.proto2";
+option objc_class_prefix = "Proto2";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;