[ObjC] mark mergeFromData:extensionRegistry: as deprecated.

Since it really isn't safe in Swift, point folks at the new api that uses errors. PiperOrigin-RevId: 511262228
protocolbuffers · Feb 21, 2023 · e3b0051 · e3b0051
1 parent cffde99
commit e3b0051
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/objectivec/GPBMessage.h b/objectivec/GPBMessage.h
@@ -276,7 +276,9 @@ CF_EXTERN_C_END
  *                                         unsuccessful.
  **/
 - (void)mergeFromData:(NSData *)data
-    extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry;
+    extensionRegistry:(nullable id<GPBExtensionRegistry>)extensionRegistry
+    __attribute__((deprecated(
+        "Use -mergeFromData:extensionRegistry:error: instead, especaily if calling from Swift.")));
 
 /**
  * Parses the given data as this message's class, and merges those values into

diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
@@ -3261,7 +3261,10 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
   if (self) {
     NSData *data = [aDecoder decodeObjectOfClass:[NSData class] forKey:kGPBDataCoderKey];
     if (data.length) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
       [self mergeFromData:data extensionRegistry:nil];
+#pragma clang diagnostic pop
     }
   }
   return self;

diff --git a/objectivec/Tests/GPBMessageTests.m b/objectivec/Tests/GPBMessageTests.m
@@ -224,7 +224,11 @@ - (void)testMergeFromWithExtensions {
   result = [self mergeExtensionsDestination];
   NSData *data = [[self mergeExtensionsSource] data];
   XCTAssertNotNil(data);
-  [result mergeFromData:data extensionRegistry:[UnittestRoot extensionRegistry]];
+  NSError *error = nil;
+  XCTAssertTrue([result mergeFromData:data
+                    extensionRegistry:[UnittestRoot extensionRegistry]
+                                error:&error]);
+  XCTAssertNil(error);
   resultData = [result data];
   XCTAssertEqualObjects(resultData, mergeResultData);
   XCTAssertEqualObjects(result, [self mergeExtensionsResult]);