Address comments from PR 41725 (#41769)

* Address comments from PR 41725

* address comments

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>

Author: yunhanw-google

src/app/clusters/icd-management-server/ICDManagementCluster.cpp

@@ -453,8 +453,13 @@ void MatterIcdManagementPluginServerInitCallback()
 
     // Configure ICD Management
     ICDManagementServer::GetInstance().Init(storage, symmetricKeystore, icdConfigurationData);
+
+// TODO(#32321): Remove #if after issue is resolved
+// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
+// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
+// server in those examples.
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    chip::Server::GetInstance().GetICDManager().RegisterObserver(&ICDManagementServer::GetInstance());
+    Server::GetInstance().GetICDManager().RegisterObserver(&ICDManagementServer::GetInstance());
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 }
 
@@ -466,7 +471,12 @@ void MatterIcdManagementPluginServerShutdownCallback()
     FabricTable & fabricTable = Server::GetInstance().GetFabricTable();
     fabricTable.RemoveFabricDelegate(&gFabricDelegate);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
+
+// TODO(#32321): Remove #if after issue is resolved
+// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
+// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
+// server in those examples.
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    chip::Server::GetInstance().GetICDManager().ReleaseObserver(&ICDManagementServer::GetInstance());
+    Server::GetInstance().GetICDManager().ReleaseObserver(&ICDManagementServer::GetInstance());
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 }

src/app/clusters/icd-management-server/ICDManagementCluster.h

@@ -53,8 +53,8 @@ class ICDManagementServer : public chip::app::ICDStateObserver
 public:
     ICDManagementServer() = default;
 
-    void Init(chip::PersistentStorageDelegate & storage, chip::Crypto::SymmetricKeystore * symmetricKeystore,
-              chip::ICDConfigurationData & ICDConfigurationData);
+    void Init(PersistentStorageDelegate & storage, Crypto::SymmetricKeystore * symmetricKeystore,
+              ICDConfigurationData & ICDConfigurationData);
 
     static ICDManagementServer & GetInstance() { return instance; };
 #if CHIP_CONFIG_ENABLE_ICD_CIP
@@ -65,14 +65,13 @@ class ICDManagementServer : public chip::app::ICDStateObserver
      * ICDConfigurationData If function fails, icdCounter will be unchanged
      * @return Status
      */
-    chip::Protocols::InteractionModel::Status
-    RegisterClient(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                   const chip::app::Clusters::IcdManagement::Commands::RegisterClient::DecodableType & commandData,
-                   uint32_t & icdCounter);
-
-    chip::Protocols::InteractionModel::Status
-    UnregisterClient(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                     const chip::app::Clusters::IcdManagement::Commands::UnregisterClient::DecodableType & commandData);
+    Protocols::InteractionModel::Status RegisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                       const IcdManagement::Commands::RegisterClient::DecodableType & commandData,
+                                                       uint32_t & icdCounter);
+
+    Protocols::InteractionModel::Status
+    UnregisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                     const IcdManagement::Commands::UnregisterClient::DecodableType & commandData);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
 private:
@@ -85,11 +84,11 @@ class ICDManagementServer : public chip::app::ICDStateObserver
     void TriggerICDMTableUpdatedEvent();
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
-    chip::ICDConfigurationData * mICDConfigurationData;
+    ICDConfigurationData * mICDConfigurationData;
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP
-    chip::PersistentStorageDelegate * mStorage;
-    chip::Crypto::SymmetricKeystore * mSymmetricKeystore;
+    PersistentStorageDelegate * mStorage;
+    Crypto::SymmetricKeystore * mSymmetricKeystore;
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
     void OnEnterActiveMode() override{};