Post Merge comments addressed. (project-chip#41967)

* Logic <-> Cluster -> merged into cluster for
NetworkCommissioningCluster.

* moving handlers into private section.

Author: emessina-max

src/app/clusters/network-commissioning/NetworkCommissioningCluster.cpp

@@ -253,7 +253,7 @@ void NetworkCommissioningCluster::SetLastNetworkingStatusValue(
 {
     if (mLastNetworkingStatusValue.Update(networkingStatusValue))
     {
-        NotifyAttributeChanged(Attributes::LastNetworkingStatus::TypeInfo::GetAttributeId());
+        NotifyAttributeChanged(Attributes::LastNetworkingStatus::Id);
     }
 }
 

src/app/clusters/network-commissioning/NetworkCommissioningCluster.h

@@ -94,6 +94,9 @@ class NetworkCommissioningCluster : private NetworkCommissioningLogicListNode,
     // with that name, with different semantics.
     void Deinit();
 
+    // Sets the breadcrumb attribute in GeneralCommissioning cluster, no-op when breadcrumbValue is NullOptional.
+    void UpdateBreadcrumb(const Optional<uint64_t> & breadcrumbValue);
+
     // BaseDriver::NetworkStatusChangeCallback
     void OnNetworkingStatusChange(DeviceLayer::NetworkCommissioning::Status aCommissioningError, Optional<ByteSpan> aNetworkId,
                                   Optional<int32_t> aConnectStatus) override;
@@ -110,27 +113,6 @@ class NetworkCommissioningCluster : private NetworkCommissioningLogicListNode,
     void OnFinished(DeviceLayer::NetworkCommissioning::Status err, CharSpan debugText,
                     DeviceLayer::NetworkCommissioning::ThreadScanResponseIterator * networks) override;
 
-    // Actual handlers of the commands
-    std::optional<DataModel::ActionReturnStatus>
-    HandleScanNetworks(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                       const NetworkCommissioning::Commands::ScanNetworks::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus>
-    HandleAddOrUpdateWiFiNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                                 const NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus>
-    HandleAddOrUpdateThreadNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                                   const NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus>
-    HandleRemoveNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                        const NetworkCommissioning::Commands::RemoveNetwork::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus>
-    HandleConnectNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                         const NetworkCommissioning::Commands::ConnectNetwork::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus>
-    HandleReorderNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
-                         const NetworkCommissioning::Commands::ReorderNetwork::DecodableType & req);
-    std::optional<DataModel::ActionReturnStatus> HandleNonConcurrentConnectNetwork();
-
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
     std::optional<DataModel::ActionReturnStatus>
     HandleQueryIdentity(CommandHandler & handler, const ConcreteCommandPath & commandPath,
@@ -262,8 +244,26 @@ class NetworkCommissioningCluster : private NetworkCommissioningLogicListNode,
     // cluster. Will set mCurrentOperationBreadcrumb to NullOptional.
     void CommitSavedBreadcrumb();
 
-    // Sets the breadcrumb attribute in GeneralCommissioning cluster, no-op when breadcrumbValue is NullOptional.
-    void UpdateBreadcrumb(const Optional<uint64_t> & breadcrumbValue);
+    // Actual handlers of the commands
+    std::optional<DataModel::ActionReturnStatus>
+    HandleScanNetworks(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                       const NetworkCommissioning::Commands::ScanNetworks::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus>
+    HandleAddOrUpdateWiFiNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                                 const NetworkCommissioning::Commands::AddOrUpdateWiFiNetwork::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus>
+    HandleAddOrUpdateThreadNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                                   const NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus>
+    HandleRemoveNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                        const NetworkCommissioning::Commands::RemoveNetwork::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus>
+    HandleConnectNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                         const NetworkCommissioning::Commands::ConnectNetwork::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus>
+    HandleReorderNetwork(CommandHandler & handler, const ConcreteCommandPath & commandPath,
+                         const NetworkCommissioning::Commands::ReorderNetwork::DecodableType & req);
+    std::optional<DataModel::ActionReturnStatus> HandleNonConcurrentConnectNetwork();
 };
 
 } // namespace Clusters