Hide type-specific initializers as per review

Author: ksperling-apple

src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.h

@@ -21,7 +21,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-MTR_DEPRECATED("Please use -[MTRSetupPayload initWithManualPairingCode:]", ios(16.1, 16.4), macos(13.0, 13.3),
+MTR_DEPRECATED("Please use -[MTRSetupPayload initWithPayload:]", ios(16.1, 16.4), macos(13.0, 13.3),
     watchos(9.1, 9.4), tvos(16.1, 16.4))
 @interface MTRManualSetupPayloadParser : NSObject
 - (instancetype)initWithDecimalStringRepresentation:(NSString *)decimalStringRepresentation;

src/darwin/Framework/CHIP/MTRManualSetupPayloadParser.mm

@@ -18,7 +18,7 @@
 #import "MTRManualSetupPayloadParser.h"
 
 #import "MTRError_Internal.h"
-#import "MTRSetupPayload.h"
+#import "MTRSetupPayload_Internal.h"
 
 @implementation MTRManualSetupPayloadParser {
     NSString * _decimalStringRepresentation;

src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.h

@@ -21,7 +21,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-MTR_DEPRECATED("Please use [MTRSetupPayload -initWithQRCode:]", ios(16.1, 16.4), macos(13.0, 13.3),
+MTR_DEPRECATED("Please use [MTRSetupPayload -initWithPayload:]", ios(16.1, 16.4), macos(13.0, 13.3),
     watchos(9.1, 9.4), tvos(16.1, 16.4))
 @interface MTRQRCodeSetupPayloadParser : NSObject
 - (instancetype)initWithBase38Representation:(NSString *)base38Representation;

src/darwin/Framework/CHIP/MTRQRCodeSetupPayloadParser.mm

@@ -18,7 +18,7 @@
 #import "MTRQRCodeSetupPayloadParser.h"
 
 #import "MTRError_Internal.h"
-#import "MTRSetupPayload.h"
+#import "MTRSetupPayload_Internal.h"
 
 @implementation MTRQRCodeSetupPayloadParser {
     NSString * _base38Representation;

src/darwin/Framework/CHIP/MTRSetupPayload.h

@@ -120,18 +120,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (nullable instancetype)initWithPayload:(NSString *)payload MTR_NEWLY_AVAILABLE;
 
-/**
- * Initializes the payload object from a QR Code string.
- * Returns nil if the QR Code string is invalid.
- */
-- (nullable instancetype)initWithQRCode:(NSString *)qrCodePayload MTR_NEWLY_AVAILABLE;
-
-/**
- * Initializes the payload object from a Manual Pairing Code string.
- * Returns nil if the pairing code is not valid.
- */
-- (nullable instancetype)initWithManualPairingCode:(NSString *)manualCode MTR_NEWLY_AVAILABLE;
-
 @property (nonatomic, copy) NSNumber * version;
 @property (nonatomic, copy) NSNumber * vendorID;
 @property (nonatomic, copy) NSNumber * productID;

src/darwin/Framework/CHIP/MTRSetupPayload_Internal.h

@@ -21,9 +21,15 @@
 
 #import <setup_payload/SetupPayload.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 MTR_DIRECT_MEMBERS
 @interface MTRSetupPayload ()
 
 - (instancetype)initWithSetupPayload:(chip::SetupPayload)setupPayload;
+- (nullable instancetype)initWithQRCode:(NSString *)qrCodePayload;
+- (nullable instancetype)initWithManualPairingCode:(NSString *)manualCode;
 
 @end
+
+NS_ASSUME_NONNULL_END

src/darwin/Framework/CHIPTests/MTRSetupPayloadTests.m

@@ -44,30 +44,6 @@ - (void)testOnboardingPayloadParser_Manual_NoError
     XCTAssertEqualObjects(payload.manualEntryCode, @"641286075300001000016");
 }
 
-- (void)testInitWithManualCode
-{
-    MTRSetupPayload * payload = [[MTRSetupPayload alloc] initWithManualPairingCode:@"641286075300001000016"];
-    XCTAssertNotNil(payload);
-    XCTAssertTrue(payload.hasShortDiscriminator);
-    XCTAssertEqual(payload.discriminator.unsignedIntegerValue, 10);
-    XCTAssertEqual(payload.setupPasscode.unsignedIntegerValue, 12345670);
-    XCTAssertEqual(payload.vendorID.unsignedIntegerValue, 1);
-    XCTAssertEqual(payload.productID.unsignedIntegerValue, 1);
-    XCTAssertEqual(payload.commissioningFlow, MTRCommissioningFlowCustom);
-    XCTAssertEqual(payload.version.unsignedIntegerValue, 0);
-    XCTAssertEqual(payload.discoveryCapabilities, MTRDiscoveryCapabilitiesUnknown);
-}
-
-- (void)testInitWithManualCode_Empty
-{
-    XCTAssertNil([[MTRSetupPayload alloc] initWithManualPairingCode:@""]);
-}
-
-- (void)testInitWithManualCode_QRCode
-{
-    XCTAssertNil([[MTRSetupPayload alloc] initWithManualPairingCode:@"MT:M5L90MP500K64J00000"]); // a valid QR code
-}
-
 - (void)testOnboardingPayloadParser_QRCode_NoError
 {
     NSError * error;
@@ -86,30 +62,6 @@ - (void)testOnboardingPayloadParser_QRCode_NoError
     XCTAssertEqual(payload.discoveryCapabilities, MTRDiscoveryCapabilitiesSoftAP);
 }
 
-- (void)testInitWithQRCode
-{
-    MTRSetupPayload * payload = [[MTRSetupPayload alloc] initWithQRCode:@"MT:M5L90MP500K64J00000"];
-    XCTAssertNotNil(payload);
-    XCTAssertFalse(payload.hasShortDiscriminator);
-    XCTAssertEqual(payload.discriminator.unsignedIntegerValue, 128);
-    XCTAssertEqual(payload.setupPasscode.unsignedIntegerValue, 2048);
-    XCTAssertEqual(payload.vendorID.unsignedIntegerValue, 12);
-    XCTAssertEqual(payload.productID.unsignedIntegerValue, 1);
-    XCTAssertEqual(payload.commissioningFlow, MTRCommissioningFlowStandard);
-    XCTAssertEqual(payload.version.unsignedIntegerValue, 0);
-    XCTAssertEqual(payload.discoveryCapabilities, MTRDiscoveryCapabilitiesSoftAP);
-}
-
-- (void)testInitWithQRCode_WrongPrefix
-{
-    XCTAssertNil([[MTRSetupPayload alloc] initWithQRCode:@"XX:M5L90MP500K64J00000"]);
-}
-
-- (void)testInitWithQRCode_ManualCode
-{
-    XCTAssertNil([[MTRSetupPayload alloc] initWithQRCode:@"641286075300001000016"]); // a valid manual pairing code
-}
-
 - (void)testOnboardingPayloadParser_QRCode_WrongVersion
 {
     // Same as testOnboardingPayloadParser_QRCode_NoError, but with version set to 5.
@@ -441,7 +393,7 @@ - (void)testSecureCodingRoundtrip
 
 - (void)testCopyingAndEquality
 {
-    MTRSetupPayload * payload = [[MTRSetupPayload alloc] initWithQRCode:@"MT:M5L9000000K64J00000"];
+    MTRSetupPayload * payload = [[MTRSetupPayload alloc] initWithPayload:@"MT:M5L9000000K64J00000"];
     XCTAssertFalse(payload.hasShortDiscriminator); // came from a QR code
     XCTAssert(payload.discriminator.integerValue > 0xf); // can't "accidentally" round-trip through a short discriminator