commit af9b46b118237d01dc4eed601dfe8950698c8624
author Andrew Jeffery <andrew@aj.id.au> Thu Apr 21 12:34:43 2022 +0930
committer Ed Tanous <ed@tanous.net> Tue May 10 18:10:59 2022 +0000
tree 4ed9e1ce7b4f22b6160c27e1461267c6f3dd337e
parent ea4ff02bf4930d4f20add6200335aa3884c51700

PerformScan: Drop dbusSubtree parameter from updateSystemConfiguration()

PerformProbe was reaching into the PerformScan instance to pass
updateSystemConfiguration() PerformScan's own dbusProbeObjects. We can
just use the implicit `this` to access it inside
updateSystemConfiguration().


Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I27124c01358e227c78c7054070ba1fc8384ac4ac

include/EntityManager.hpp

diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp
index f443874..2d79e1f 100644
--- a/include/EntityManager.hpp
+++ b/include/EntityManager.hpp
@@ -72,8 +72,7 @@
                 std::function<void()>&& callback);
     void updateSystemConfiguration(const nlohmann::json& recordRef,
                                    const std::string& probeName,
-                                   FoundDevices& foundDevices,
-                                   const MapperGetSubTreeResponse& dbusSubtree);
+                                   FoundDevices& foundDevices);
     void run(void);
     virtual ~PerformScan();
     nlohmann::json& _systemConfiguration;

src/PerformProbe.cpp

diff --git a/src/PerformProbe.cpp b/src/PerformProbe.cpp
index 7c5a2b2..af9373c 100644
--- a/src/PerformProbe.cpp
+++ b/src/PerformProbe.cpp
@@ -231,7 +231,6 @@
     FoundDevices foundDevs;
     if (probe(_probeCommand, scan, foundDevs))
     {
-        scan->updateSystemConfiguration(recordRef, probeName, foundDevs,
-                                        scan->dbusProbeObjects);
+        scan->updateSystemConfiguration(recordRef, probeName, foundDevs);
     }
 }

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index c81557f..144b824 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -464,9 +464,9 @@
     return copyIt.value();
 }
 
-void PerformScan::updateSystemConfiguration(
-    const nlohmann::json& recordRef, const std::string& probeName,
-    FoundDevices& foundDevices, const MapperGetSubTreeResponse& dbusSubtree)
+void PerformScan::updateSystemConfiguration(const nlohmann::json& recordRef,
+                                            const std::string& probeName,
+                                            FoundDevices& foundDevices)
 {
     _passed = true;
     passedProbes.push_back(probeName);
@@ -515,9 +515,10 @@
         // interface, such as if it was just TRUE, then
         // templateCharReplace will just get passed in an empty
         // map.
-        auto objectIt = dbusSubtree.find(path);
-        const DBusObject& dbusObject =
-            (objectIt == dbusSubtree.end()) ? emptyObject : objectIt->second;
+        auto objectIt = dbusProbeObjects.find(path);
+        const DBusObject& dbusObject = (objectIt == dbusProbeObjects.end())
+                                           ? emptyObject
+                                           : objectIt->second;
 
         nlohmann::json record = recordRef;
         std::string recordName = getRecordName(foundDevice, probeName);