Address review comments

examples/fabric-admin/device_manager/CommissionerControl.cpp

@@ -1,3 +1,21 @@
+/*
+ *   Copyright (c) 2024 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
 #include "CommissionerControl.h"
 #include "DeviceManager.h"
 

examples/fabric-sync/admin/CommissionerControl.cpp

@@ -1,3 +1,21 @@
+/*
+ *   Copyright (c) 2024 Project CHIP Authors
+ *   All rights reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
 #include "CommissionerControl.h"
 #include "DeviceManager.h"
 

examples/fabric-sync/admin/DeviceManager.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/admin/DeviceManager.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/admin/DeviceSubscription.cpp

@@ -61,7 +61,7 @@ void DeviceSubscription::OnAttributeData(const ConcreteDataAttributePath & path,
         CHIP_ERROR err = data->Get(windowStatus);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(NotSpecified, "Failed to read WindowStatus"));
         VerifyOrReturn(windowStatus != Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kUnknownEnumValue);
-        mCurrentAdministratorCommissioningAttributes.windowStatus = static_cast<uint8_t>(windowStatus);
+        mCurrentAdministratorCommissioningAttributes.windowStatus = windowStatus;
         mChangeDetected                                           = true;
         break;
     }
@@ -236,7 +236,7 @@ CHIP_ERROR DeviceSubscription::StartSubscription(OnDoneCallback onDoneCallback,
     mCurrentAdministratorCommissioningAttributes    = AdministratorCommissioningChanged_init_default;
     mCurrentAdministratorCommissioningAttributes.id = scopedNodeId;
     mCurrentAdministratorCommissioningAttributes.windowStatus =
-        static_cast<uint8_t>(Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
+        Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen;
 
     mOnDoneCallback = onDoneCallback;
     MoveToState(State::Connecting);

examples/fabric-sync/admin/DeviceSynchronization.cpp

@@ -33,6 +33,8 @@ namespace admin {
 
 namespace {
 
+constexpr uint16_t kBasicInformationAttributeBufSize = 128;
+
 void OnDeviceConnectedWrapper(void * context, Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle)
 {
     reinterpret_cast<DeviceSynchronizer *>(context)->OnDeviceConnected(exchangeMgr, sessionHandle);
@@ -82,39 +84,39 @@ void DeviceSynchronizer::OnAttributeData(const ConcreteDataAttributePath & path,
     switch (path.mAttributeId)
     {
     case Clusters::BasicInformation::Attributes::UniqueID::Id: {
-        char uniqueIdBuffer[128]; // Adjust size as needed
+        char uniqueIdBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(uniqueIdBuffer, sizeof(uniqueIdBuffer)), "UniqueId"))
         {
             mCurrentDeviceData.uniqueId = std::string(uniqueIdBuffer);
         }
     }
     break;
     case Clusters::BasicInformation::Attributes::VendorName::Id: {
-        char vendorNameBuffer[128]; // Adjust size as needed
+        char vendorNameBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(vendorNameBuffer, sizeof(vendorNameBuffer)), "VendorName"))
         {
             mCurrentDeviceData.vendorName = std::string(vendorNameBuffer);
         }
     }
     break;
     case Clusters::BasicInformation::Attributes::ProductName::Id: {
-        char productNameBuffer[128]; // Adjust size as needed
+        char productNameBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(productNameBuffer, sizeof(productNameBuffer)), "ProductName"))
         {
             mCurrentDeviceData.productName = std::string(productNameBuffer);
         }
     }
     break;
     case Clusters::BasicInformation::Attributes::NodeLabel::Id: {
-        char nodeLabelBuffer[128]; // Adjust size as needed
+        char nodeLabelBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(nodeLabelBuffer, sizeof(nodeLabelBuffer)), "NodeLabel"))
         {
             mCurrentDeviceData.nodeLabel = std::string(nodeLabelBuffer);
         }
     }
     break;
     case Clusters::BasicInformation::Attributes::HardwareVersionString::Id: {
-        char hardwareVersionStringBuffer[128]; // Adjust size as needed
+        char hardwareVersionStringBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(hardwareVersionStringBuffer, sizeof(hardwareVersionStringBuffer)),
                          "HardwareVersionString"))
         {
@@ -123,7 +125,7 @@ void DeviceSynchronizer::OnAttributeData(const ConcreteDataAttributePath & path,
     }
     break;
     case Clusters::BasicInformation::Attributes::SoftwareVersionString::Id: {
-        char softwareVersionStringBuffer[128]; // Adjust size as needed
+        char softwareVersionStringBuffer[kBasicInformationAttributeBufSize];
         if (SuccessOrLog(data->GetString(softwareVersionStringBuffer, sizeof(softwareVersionStringBuffer)),
                          "SoftwareVersionString"))
         {

examples/fabric-sync/admin/FabricAdmin.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/admin/FabricAdmin.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/admin/PairingManager.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/admin/PairingManager.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/Bridge.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/BridgedDevice.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/BridgedDeviceManager.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/CHIPProjectAppConfig.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/CommissionerControlDelegate.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/FabricAdminDelegate.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/include/FabricBridge.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *
@@ -20,6 +19,7 @@
 
 #include "FabricAdminDelegate.h"
 
+#include <app-common/zap-generated/cluster-objects.h>
 #include <lib/core/CHIPError.h>
 #include <lib/core/ScopedNodeId.h>
 #include <optional>
@@ -46,10 +46,10 @@ namespace bridge {
 
 #define AdministratorCommissioningChanged_init_default                                                                             \
     {                                                                                                                              \
-        ScopedNodeId_init_default, /* id */                                                                                        \
-            0,                     /* windowStatus */                                                                              \
-            std::nullopt,          /* openerFabricIndex */                                                                         \
-            std::nullopt           /* openerVendorId */                                                                            \
+        ScopedNodeId_init_default,                                                                          /* id */               \
+            chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen, /* windowStatus */     \
+            std::nullopt, /* openerFabricIndex */                                                                                  \
+            std::nullopt  /* openerVendorId */                                                                                     \
     }
 
 struct SynchronizedDevice
@@ -72,7 +72,7 @@ struct SynchronizedDevice
 struct AdministratorCommissioningChanged
 {
     chip::ScopedNodeId id;
-    uint8_t windowStatus;
+    chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum windowStatus;
     std::optional<chip::FabricIndex> openerFabricIndex;
     std::optional<chip::VendorId> openerVendorId;
 };

examples/fabric-sync/bridge/src/Bridge.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/src/BridgedDevice.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/src/BridgedDeviceManager.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/src/CommissionerControlDelegate.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/bridge/src/FabricBridge.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *
@@ -124,6 +123,12 @@ CHIP_ERROR FabricBridge::AddSynchronizedDevice(const SynchronizedDevice & data)
         app::Clusters::EcosystemInformation::EcosystemInformationServer::Instance().AddEcosystemInformationClusterToEndpoint(
             addedDevice->GetEndpointId());
 
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to add Ecosystem Information Cluster to endpoint %u: %" CHIP_ERROR_FORMAT,
+                     addedDevice->GetEndpointId(), err.Format());
+    }
+
     return err;
 }
 
@@ -175,12 +180,11 @@ CHIP_ERROR FabricBridge::AdminCommissioningAttributeChanged(const AdministratorC
 
     BridgedDevice::AdminCommissioningAttributes adminCommissioningAttributes;
 
-    uint32_t maxWindowStatusValue =
-        static_cast<uint32_t>(app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kUnknownEnumValue);
-    VerifyOrReturnError(data.windowStatus < maxWindowStatusValue, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(data.windowStatus <
+                            app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kUnknownEnumValue,
+                        CHIP_ERROR_INVALID_ARGUMENT);
 
-    adminCommissioningAttributes.commissioningWindowStatus =
-        static_cast<app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>(data.windowStatus);
+    adminCommissioningAttributes.commissioningWindowStatus = data.windowStatus;
     if (data.openerFabricIndex.has_value())
     {
         VerifyOrReturnError(data.openerFabricIndex >= kMinValidFabricIndex, CHIP_ERROR_INVALID_ARGUMENT);

examples/fabric-sync/main.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *

examples/fabric-sync/shell/ShellCommands.cpp

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

examples/fabric-sync/shell/ShellCommands.h

@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *