From b9d36b4791d77a47e1f3c5c4564fcdf7cc68c115 Mon Sep 17 00:00:00 2001
From: Ed Tanous <edtanous@google.com>
Date: Sat, 26 Feb 2022 21:42:46 -0800
Subject: Consitently use dbus::utility types

This saves about 4k on the binary size

Tested: Redfish service validator passes.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I9546227a19c691b1aecb80e80307889548c0293f
---
 redfish-core/lib/certificate_service.hpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'redfish-core/lib/certificate_service.hpp')

diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp
index 6d17a6173b..4882ec30f8 100644
--- a/redfish-core/lib/certificate_service.hpp
+++ b/redfish-core/lib/certificate_service.hpp
@@ -452,11 +452,9 @@ inline void requestRoutesCertificateActionGenerateCSR(App& app)
                         messages::internalError(asyncResp->res);
                         return;
                     }
-                    std::vector<std::pair<
-                        std::string,
-                        std::vector<std::pair<std::string,
-                                              dbus::utility::DbusVariantType>>>>
-                        interfacesProperties;
+
+                    dbus::utility::DBusInteracesMap interfacesProperties;
+
                     sdbusplus::message::object_path csrObjectPath;
                     m.read(csrObjectPath, interfacesProperties);
                     BMCWEB_LOG_DEBUG << "CSR object added" << csrObjectPath.str;
@@ -572,13 +570,12 @@ static void getCertificateProperties(
     const std::string& objectPath, const std::string& service, long certId,
     const std::string& certURL, const std::string& name)
 {
-    using PropertiesMap =
-        boost::container::flat_map<std::string, dbus::utility::DbusVariantType>;
     BMCWEB_LOG_DEBUG << "getCertificateProperties Path=" << objectPath
                      << " certId=" << certId << " certURl=" << certURL;
     crow::connections::systemBus->async_method_call(
-        [asyncResp, certURL, certId, name](const boost::system::error_code ec,
-                                           const PropertiesMap& properties) {
+        [asyncResp, certURL, certId,
+         name](const boost::system::error_code ec,
+               const dbus::utility::DBusPropertiesMap& properties) {
             if (ec)
             {
                 BMCWEB_LOG_ERROR << "DBUS response error: " << ec;
@@ -666,9 +663,6 @@ static void getCertificateProperties(
         certs::certPropIntf);
 }
 
-using GetObjectType =
-    std::vector<std::pair<std::string, std::vector<std::string>>>;
-
 /**
  * Action to replace an existing certificate
  */
-- 
cgit v1.2.3