[Darwin] Update templates to preserve acronyms (e.g ACL) in APIs. (#2…

…3800)

This is a re-landing of PR #22665 but with backwards compat preserved
and some of the comment-only changes removed to ease review; those
will re-land in a separate PR.

* Update ZAP repo

* [Darwin] Update template to preserve acronyms (e.g ACL) in APIs

* Ota -> OTA in src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m

* Update generated code

The header changes not accompanied by backwards-compat shims are OK for the
following reasons:

* The changes to the argument types in MTROTAProviderDelegate.h are in
  MTR_NEWLY_AVAILABLE APIs.
* MTROTAProviderDelegateBridge.h is not public API.
* In MTRBaseClusters.h readAttributeAclWithParams, writeAttributeAclWithValue,
  subscribeAttributeAclWithParams, readAttributeAclWithClusterStateCache get
  renamed only in MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateProvider gets renamed to
  MTRBaseClusterOTASoftwareUpdateProvider.  This is OK because all the selectors
  on it are MTR_NEWLY_AVAILABLE and a shim is provided for the (Deprecated)
  extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateProviderCluster* structs in arguments
  get renamed to MTROTASoftwareUpdateProviderCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterOtaSoftwareUpdateRequestor gets renamed to
  MTRBaseClusterOTASoftwareUpdateRequestor.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* In MTRBaseClusters.h MTROtaSoftwareUpdateRequestorCluster* structs in
  arguments get renamed to MTROTASoftwareUpdateRequestorCluster* only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h *AttributePir* bits get renamed only in
  MTR_NEWLY_AVAILABLE APIs.
* In MTRBaseClusters.h MTRBaseClusterWakeOnLan gets renamed to
  MTRBaseClusterWakeOnLAN and needs a shim.  This is OK because all the
  selectors on it are MTR_NEWLY_AVAILABLE and a shim is provided for the
  (Deprecated) extension.
* MTRBaseClusters_internal.h is not public API.
* MTRCallbackBridge_internal.h is not public API.
* In MTRClusterConstants.h all the name changes are to MTR_NEWLY_AVAILABLE
  constants.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateProvider to
  MTRClusterOTASoftwareUpdateProvider is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterOtaSoftwareUpdateRequestor to
  MTRClusterOTASoftwareUpdateRequestor is OK because a shim is provided.
* In MTRClusters.h renaming MTRClusterWakeOnLan to MTRClusterWakeOnLAN is OK
  because a shim is provided.
* In MTRClusters.h, all the attributes that had their names change get shims.
* MTRClusters_internal.h is not public API.

Co-authored-by: Vivien Nicolas <vnicolas@apple.com>

.github/workflows/zap_regeneration.yaml

@@ -28,7 +28,7 @@ jobs:
 
  runs-on: ubuntu-20.04
  container:
- image: connectedhomeip/chip-build:0.6.11
+ image: connectedhomeip/chip-build:0.6.15
  defaults:
  run:
  shell: sh

.github/workflows/zap_templates.yaml

@@ -29,7 +29,7 @@ jobs:
 
  runs-on: ubuntu-20.04
  container:
- image: connectedhomeip/chip-build:0.6.11
+ image: connectedhomeip/chip-build:0.6.15
  defaults:
  run:
  shell: sh

examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.h

@@ -24,44 +24,44 @@ typedef NS_ENUM(uint8_t, UserConsentState) {
  OTAProviderUserUnknown = 0x03,
 };
 
-@interface DeviceSoftwareVersionModelData : MTROtaSoftwareUpdateProviderClusterQueryImageParams
+@interface DeviceSoftwareVersionModelData : MTROTASoftwareUpdateProviderClusterQueryImageParams
 @property BOOL softwareVersionValid;
 @property (strong, nonatomic, nullable) NSNumber * cDVersionNumber;
 @property (strong, nonatomic, nullable) NSNumber * minApplicableSoftwareVersion;
 @property (strong, nonatomic, nullable) NSNumber * maxApplicableSoftwareVersion;
 @property (strong, nonatomic, nullable) NSString * otaURL;
 @end
 
-@interface DeviceSoftwareVersionModel : MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams
+@interface DeviceSoftwareVersionModel : MTROTASoftwareUpdateProviderClusterQueryImageResponseParams
 @property (strong, nonatomic, nullable) DeviceSoftwareVersionModelData * deviceModelData;
 - (NSComparisonResult)CompareSoftwareVersions:(DeviceSoftwareVersionModel * _Nullable)otherObject;
 @end
 
 @interface OTAProviderDelegate : NSObject <MTROTAProviderDelegate>
 - (void)handleQueryImageForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterQueryImageParams * _Nonnull)params
- completion:(void (^_Nonnull)(MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
+ params:(MTROTASoftwareUpdateProviderClusterQueryImageParams * _Nonnull)params
+ completion:(void (^_Nonnull)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
  NSError * _Nullable error))completion;
 
 - (void)handleApplyUpdateRequestForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterApplyUpdateRequestParams * _Nonnull)params
+ params:(MTROTASoftwareUpdateProviderClusterApplyUpdateRequestParams * _Nonnull)params
  completion:
- (void (^_Nonnull)(MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
+ (void (^_Nonnull)(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
  NSError * _Nullable error))completion;
 
 - (void)handleNotifyUpdateAppliedForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams * _Nonnull)params
+ params:(MTROTASoftwareUpdateProviderClusterNotifyUpdateAppliedParams * _Nonnull)params
  completion:(MTRStatusCompletion _Nonnull)completion;
 
 @property (strong, nonatomic, nullable) NSArray<DeviceSoftwareVersionModel *> * candidates;
 @property (strong, nonatomic, nullable) DeviceSoftwareVersionModel * selectedCandidate;
 @property (strong, nonatomic, nullable) NSNumber * nodeID;
-@property (nonatomic, readwrite) MTROtaSoftwareUpdateProviderOTAQueryStatus queryImageStatus;
+@property (nonatomic, readwrite) MTROTASoftwareUpdateProviderOTAQueryStatus queryImageStatus;
 @property (nonatomic, readwrite) UserConsentState userConsentState;
-@property (nonatomic, readwrite) MTROtaSoftwareUpdateProviderOTAApplyUpdateAction action;
+@property (nonatomic, readwrite) MTROTASoftwareUpdateProviderOTAApplyUpdateAction action;
 @property (nonatomic, readwrite, nullable) NSNumber * delayedActionTime;
 @property (nonatomic, readwrite, nullable) NSNumber * timedInvokeTimeoutMs;
 @property (nonatomic, readwrite, nullable) NSNumber * userConsentNeeded;

examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm

@@ -35,34 +35,34 @@ - (instancetype)init
 {
  if (self = [super init]) {
  _selectedCandidate = [[DeviceSoftwareVersionModel alloc] init];
- _action = MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed;
+ _action = MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed;
  _userConsentState = OTAProviderUserUnknown;
  _delayedActionTime = nil;
  _timedInvokeTimeoutMs = nil;
  _userConsentNeeded = nil;
- _queryImageStatus = MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable;
+ _queryImageStatus = MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable;
  }
  return self;
 }
 
 - (void)handleQueryImageForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterQueryImageParams * _Nonnull)params
- completion:(void (^_Nonnull)(MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
+ params:(MTROTASoftwareUpdateProviderClusterQueryImageParams * _Nonnull)params
+ completion:(void (^_Nonnull)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data,
  NSError * _Nullable error))completion
 {
  auto isBDXProtocolSupported =
- [params.protocolsSupported containsObject:@(MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXSynchronous)];
+ [params.protocolsSupported containsObject:@(MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous)];
  if (!isBDXProtocolSupported) {
- _selectedCandidate.status = @(MTROtaSoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported);
+ _selectedCandidate.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported);
  completion(_selectedCandidate, nil);
  return;
  }
 
  auto hasCandidate = [self SelectOTACandidate:params.vendorId rPID:params.productId rSV:params.softwareVersion];
  if (!hasCandidate) {
  NSLog(@"Unable to select OTA Image.");
- _selectedCandidate.status = @(MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable);
+ _selectedCandidate.status = @(MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable);
  completion(_selectedCandidate, nil);
  return;
  }
@@ -80,13 +80,13 @@ - (void)handleQueryImageForNodeID:(NSNumber * _Nonnull)nodeID
 
 - (void)handleApplyUpdateRequestForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterApplyUpdateRequestParams * _Nonnull)params
+ params:(MTROTASoftwareUpdateProviderClusterApplyUpdateRequestParams * _Nonnull)params
  completion:
- (void (^_Nonnull)(MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
+ (void (^_Nonnull)(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data,
  NSError * _Nullable error))completion
 {
- MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * applyUpdateResponseParams =
- [[MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams alloc] init];
+ MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * applyUpdateResponseParams =
+ [[MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams alloc] init];
  applyUpdateResponseParams.action = @(_action);
  if (_delayedActionTime) {
  applyUpdateResponseParams.delayedActionTime = _delayedActionTime;
@@ -100,7 +100,7 @@ - (void)handleApplyUpdateRequestForNodeID:(NSNumber * _Nonnull)nodeID
 
 - (void)handleNotifyUpdateAppliedForNodeID:(NSNumber * _Nonnull)nodeID
  controller:(MTRDeviceController * _Nonnull)controller
- params:(MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams * _Nonnull)params
+ params:(MTROTASoftwareUpdateProviderClusterNotifyUpdateAppliedParams * _Nonnull)params
  completion:(MTRStatusCompletion _Nonnull)completion
 {
  completion(nil);

examples/darwin-framework-tool/commands/provider/OTASoftwareUpdateInteractive.mm

@@ -161,14 +161,14 @@ static bool ParseJsonFileAndPopulateCandidates(
 {
  CHIP_ERROR error = CHIP_NO_ERROR;
  if (action == 0) {
- mOTADelegate.action = MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed;
- ChipLogDetail(chipTool, "Successfully set action to: MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed");
+ mOTADelegate.action = MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed;
+ ChipLogDetail(chipTool, "Successfully set action to: MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed");
  } else if (action == 1) {
- mOTADelegate.action = MTROtaSoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction;
- ChipLogDetail(chipTool, "Successfully set action to: MTROtaSoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction");
+ mOTADelegate.action = MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction;
+ ChipLogDetail(chipTool, "Successfully set action to: MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction");
  } else if (action == 2) {
- mOTADelegate.action = MTROtaSoftwareUpdateProviderOTAApplyUpdateActionDiscontinue;
- ChipLogDetail(chipTool, "Successfully set action to: MTROtaSoftwareUpdateProviderOTAApplyUpdateActionDiscontinue");
+ mOTADelegate.action = MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue;
+ ChipLogDetail(chipTool, "Successfully set action to: MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue");
  } else {
  ChipLogError(chipTool, "Only accepts the following: 0 (Proceed), 1 (Await Next Action), 2 (Discontinue)");
  error = CHIP_ERROR_INTERNAL;
@@ -179,18 +179,18 @@ static bool ParseJsonFileAndPopulateCandidates(
 {
  CHIP_ERROR error = CHIP_NO_ERROR;
  if (status == 0) {
- mOTADelegate.queryImageStatus = MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable;
- ChipLogDetail(chipTool, "Successfully set status to: MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable");
+ mOTADelegate.queryImageStatus = MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable;
+ ChipLogDetail(chipTool, "Successfully set status to: MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable");
  } else if (status == 1) {
- mOTADelegate.queryImageStatus = MTROtaSoftwareUpdateProviderOTAQueryStatusBusy;
- ChipLogDetail(chipTool, "Successfully set status to: MTROtaSoftwareUpdateProviderOTAQueryStatusBusy");
+ mOTADelegate.queryImageStatus = MTROTASoftwareUpdateProviderOTAQueryStatusBusy;
+ ChipLogDetail(chipTool, "Successfully set status to: MTROTASoftwareUpdateProviderOTAQueryStatusBusy");
  } else if (status == 2) {
- mOTADelegate.queryImageStatus = MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable;
- ChipLogDetail(chipTool, "Successfully set status to: MTROtaSoftwareUpdateProviderOTAQueryStatusNotAvailable");
+ mOTADelegate.queryImageStatus = MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable;
+ ChipLogDetail(chipTool, "Successfully set status to: MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable");
  } else if (status == 4) {
- mOTADelegate.queryImageStatus = MTROtaSoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported;
+ mOTADelegate.queryImageStatus = MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported;
  ChipLogDetail(
- chipTool, "Successfully set status to: MTROtaSoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported");
+ chipTool, "Successfully set status to: MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported");
  } else {
  ChipLogError(chipTool, "Only accepts the following: 0 (Available), 1 (Busy), 2 (Not Available), 3 (Not Supported)");
  error = CHIP_ERROR_INTERNAL;

examples/darwin-framework-tool/templates/commands.zapt

@@ -46,8 +46,8 @@ public:
  ChipLogProgress(chipTool, "Sending cluster ({{asHex parent.code 8}}) command ({{asHex code 8}}) on endpoint %u", endpointId);
 
  dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseCluster{{asUpperCamelCase clusterName}} * cluster = [[MTRBaseCluster{{asUpperCamelCase clusterName}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- __auto_type * params = [[MTR{{asUpperCamelCase clusterName}}Cluster{{asUpperCamelCase name}}Params alloc] init];
+ __auto_type * cluster = [[MTRBaseCluster{{asUpperCamelCase clusterName preserveAcronyms=true}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+ __auto_type * params = [[MTR{{asUpperCamelCase clusterName preserveAcronyms=true}}Cluster{{asUpperCamelCase name preserveAcronyms=true}}Params alloc] init];
  params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
  {{#chip_cluster_command_arguments}}
  {{>decodable_value target=(concat "params." (asStructPropertyName label)) source=(concat "mRequest." (asLowerCamelCase label)) cluster=parent.clusterName type=type depth=0}}
@@ -58,7 +58,7 @@ public:
  {
  [cluster {{asLowerCamelCase name}}WithParams:params completion:
  {{#if hasSpecificResponse}}
- ^(MTR{{asUpperCamelCase clusterName}}Cluster{{asUpperCamelCase responseName}}Params * _Nullable values, NSError * _Nullable error) {
+ ^(MTR{{asUpperCamelCase clusterName preserveAcronyms=true}}Cluster{{asUpperCamelCase responseName}}Params * _Nullable values, NSError * _Nullable error) {
  NSLog(@"Values: %@", values);
  {{else}}
  ^(NSError * _Nullable error) {
@@ -90,7 +90,8 @@ private:
 {{/chip_cluster_commands}}
 
 {{#chip_server_cluster_attributes}}
-{{#*inline "attribute"}}Attribute{{asUpperCamelCase name}}{{/inline}}
+{{#*inline "cluster"}}Cluster{{asUpperCamelCase parent.name preserveAcronyms=true}}{{/inline}}
+{{#*inline "attribute"}}Attribute{{asUpperCamelCase name preserveAcronyms=true}}{{/inline}}
 
 /*
  * Attribute {{asUpperCamelCase name}}
@@ -111,23 +112,23 @@ public:
  ChipLogProgress(chipTool, "Sending cluster ({{asHex parent.code 8}}) ReadAttribute ({{asHex code 8}}) on endpoint %u", endpointId);
 
  dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseCluster{{asUpperCamelCase parent.name}} * cluster = [[MTRBaseCluster{{asUpperCamelCase parent.name}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+ __auto_type * cluster = [[MTRBase{{>cluster}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
  {{#if_is_fabric_scoped_struct type}}
- MTRReadParams * params = [[MTRReadParams alloc] init];
+ __auto_type * params = [[MTRReadParams alloc] init];
  if (mFabricFiltered.HasValue()) {
  params.filterByFabric = mFabricFiltered.Value();
  }
  {{/if_is_fabric_scoped_struct}}
- [cluster readAttribute{{asUpperCamelCase name}}With
+ [cluster read{{>attribute}}With
  {{~#if_is_fabric_scoped_struct type~}}
  Params:params completion:
  {{~else~}}
  Completion:
  {{~/if_is_fabric_scoped_struct~}}
  ^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error) {
- NSLog(@"{{asUpperCamelCase parent.name}}.{{asUpperCamelCase name}} response %@", [value description]);
+ NSLog(@"{{asUpperCamelCase parent.name preserveAcronyms=true}}.{{asUpperCamelCase name preserveAcronyms=true}} response %@", [value description]);
  if (error != nil) {
- LogNSError("{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} read Error", error);
+ LogNSError("{{asUpperCamelCase parent.name preserveAcronyms=true}} {{asUpperCamelCase name preserveAcronyms=true}} read Error", error);
  }
  SetCommandExitStatus(error);
  }];
@@ -163,8 +164,8 @@ public:
  {
  ChipLogProgress(chipTool, "Sending cluster ({{asHex parent.code 8}}) WriteAttribute ({{asHex code 8}}) on endpoint %u", endpointId);
  dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseCluster{{asUpperCamelCase parent.name}} * cluster = [[MTRBaseCluster{{asUpperCamelCase parent.name}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- MTRWriteParams * params = [[MTRWriteParams alloc] init];
+ __auto_type * cluster = [[MTRBase{{>cluster}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+ __auto_type * params = [[MTRWriteParams alloc] init];
  params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
  params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
  {{#if_chip_complex}}
@@ -178,9 +179,9 @@ public:
  {{asObjectiveCType type parent.name}} value = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:mValue];
  {{/if_chip_complex}}
 
- [cluster writeAttribute{{asUpperCamelCase name}}WithValue:value params:params completion:^(NSError * _Nullable error) {
+ [cluster write{{>attribute}}WithValue:value params:params completion:^(NSError * _Nullable error) {
  if (error != nil) {
- LogNSError("{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} write Error", error);
+ LogNSError("{{asUpperCamelCase parent.name preserveAcronyms=true}} {{asUpperCamelCase name preserveAcronyms=true}} write Error", error);
  }
  SetCommandExitStatus(error);
  }];
@@ -217,8 +218,8 @@ public:
  {
  ChipLogProgress(chipTool, "Sending cluster ({{asHex parent.code 8}}) ReportAttribute ({{asHex code 8}}) on endpoint %u", endpointId);
  dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseCluster{{asUpperCamelCase parent.name}} * cluster = [[MTRBaseCluster{{asUpperCamelCase parent.name}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
+ __auto_type * cluster = [[MTRBase{{>cluster}} alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+ __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
  if (mKeepSubscriptions.HasValue()) {
  params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
  }
@@ -231,7 +232,7 @@ public:
  [cluster subscribe{{>attribute}}WithParams:params
  subscriptionEstablished:^(){ mSubscriptionEstablished=YES; }
  reportHandler:^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error) {
- NSLog(@"{{asUpperCamelCase parent.name}}.{{asUpperCamelCase name}} response %@", [value description]);
+ NSLog(@"{{asUpperCamelCase parent.name preserveAcronyms=true}}.{{asUpperCamelCase name preserveAcronyms=true}} response %@", [value description]);
  SetCommandExitStatus(error);
  }];