commit 047f60e01adec4f7c0819a321ccde97e3ecb25b4
author Andrew Geissler <geissonator@yahoo.com> Wed Apr 06 15:38:07 2022 -0500
committer Adriana Kobylak <anoo@linux.ibm.com> Mon Apr 11 20:59:38 2022 +0000
tree db5a58ec9d0b373b74db4a80eb2c725e6667127e
parent 3afdaaf36e7e7cd8ea0b8cee43b15811b8766868

make getproperty a templated function

This will make it more generic so other types of properties can be read

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Icc7c040ec44d470b6b62d8b74200c7e35012e25c

usb/usb_manager.cpp

diff --git a/usb/usb_manager.cpp b/usb/usb_manager.cpp
index 4a1f768..2bab2de 100644
--- a/usb/usb_manager.cpp
+++ b/usb/usb_manager.cpp
@@ -109,9 +109,9 @@
 
         try
         {
-            auto propVal =
-                utils::getProperty(bus, path.str, imageInterface, "Activation");
-            const auto& imageProp = std::get<std::string>(propVal);
+            auto imageProp = utils::getProperty<std::string>(
+                bus, path.str, imageInterface, "Activation");
+
             if (imageProp == readyPro && isUSBCodeUpdate)
             {
                 setApplyTime();

utils.cpp

diff --git a/utils.cpp b/utils.cpp
index 6763768..d661fb3 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -41,28 +41,6 @@
     return response[0].first;
 }
 
-const PropertyValue getProperty(sdbusplus::bus::bus& bus,
-                                const std::string& objectPath,
-                                const std::string& interface,
-                                const std::string& propertyName)
-{
-    PropertyValue value{};
-    auto service = getService(bus, objectPath, interface);
-    if (service.empty())
-    {
-        return value;
-    }
-
-    auto method = bus.new_method_call(service.c_str(), objectPath.c_str(),
-                                      "org.freedesktop.DBus.Properties", "Get");
-    method.append(interface, propertyName);
-
-    auto reply = bus.call(method);
-    reply.read(value);
-
-    return value;
-}
-
 void setProperty(sdbusplus::bus::bus& bus, const std::string& objectPath,
                  const std::string& interface, const std::string& propertyName,
                  const PropertyValue& value)

utils.hpp

diff --git a/utils.hpp b/utils.hpp
index 1a695f4..2174938 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -30,10 +30,26 @@
  *
  *  @throw sdbusplus::exception::exception when it fails
  */
-const PropertyValue getProperty(sdbusplus::bus::bus& bus,
-                                const std::string& objectPath,
-                                const std::string& interface,
-                                const std::string& propertyName);
+template <typename T>
+T getProperty(sdbusplus::bus::bus& bus, const std::string& objectPath,
+              const std::string& interface, const std::string& propertyName)
+{
+    std::variant<T> value{};
+    auto service = getService(bus, objectPath, interface);
+    if (service.empty())
+    {
+        return std::get<T>(value);
+    }
+
+    auto method = bus.new_method_call(service.c_str(), objectPath.c_str(),
+                                      "org.freedesktop.DBus.Properties", "Get");
+    method.append(interface, propertyName);
+
+    auto reply = bus.call(method);
+    reply.read(value);
+
+    return std::get<T>(value);
+}
 
 /** @brief Set D-Bus property
  *