🚿 Make ElementarySupervision ctor default:

- The callback is now will be set via a dedicated function.

Author: langroodi

src/ara/phm/supervisors/elementary_supervision.cpp

@@ -7,9 +7,8 @@ namespace ara
     {
         namespace supervisors
         {
-            ElementarySupervision::ElementarySupervision(
-                std::function<void(SupervisionStatus)> &&callback) : mOnStatusChanged{std::move(callback)},
-                                                                     mStatus{SupervisionStatus::kDeactivated}
+            ElementarySupervision::ElementarySupervision() noexcept : mStatus{SupervisionStatus::kDeactivated},
+                                                                      mOnStatusChanged{nullptr}
             {
             }
 
@@ -22,7 +21,10 @@ namespace ara
                     case SupervisionStatus::kDeactivated:
                     case SupervisionStatus::kExpired:
                         mStatus = status;
-                        mOnStatusChanged(mStatus);
+                        if (mOnStatusChanged)
+                        {
+                            mOnStatusChanged(mStatus);
+                        }
                         break;
 
                     case SupervisionStatus::kOk:
@@ -31,7 +33,10 @@ namespace ara
                         if (mStatus != SupervisionStatus::kExpired)
                         {
                             mStatus = status;
-                            mOnStatusChanged(mStatus);
+                            if (mOnStatusChanged)
+                            {
+                                mOnStatusChanged(mStatus);
+                            }
                         }
 
                         break;
@@ -46,6 +51,12 @@ namespace ara
             {
                 return mStatus;
             }
+
+            void ElementarySupervision::SetCallback(
+                std::function<void(SupervisionStatus)> &&callback)
+            {
+                mOnStatusChanged = std::move(callback);
+            }
         }
     }
 }

src/ara/phm/supervisors/elementary_supervision.h

@@ -23,26 +23,27 @@ namespace ara
             class ElementarySupervision
             {
             private:
-                const std::function<void(SupervisionStatus)> mOnStatusChanged;
                 SupervisionStatus mStatus;
+                std::function<void(SupervisionStatus)> mOnStatusChanged;
 
             protected:
-                /// @brief Constructor
-                /// @param callback Callback to be invoked on the supervision status change
-                ElementarySupervision(
-                    std::function<void(SupervisionStatus)> &&callback);
+                ElementarySupervision() noexcept;
 
                 /// @brief Report the new supervision status
                 /// @param status New status of the supervision method
                 void Report(SupervisionStatus status);
 
             public:
-                ElementarySupervision() = delete;
                 virtual ~ElementarySupervision() noexcept = default;
 
                 /// @brief Get the supervision status
                 /// @returns Current elementary supervision status
                 SupervisionStatus GetStatus() const noexcept;
+
+                /// @brief Set a callback to be invoked on the supervision status change
+                /// @param callback On supervision status changed callback
+                void SetCallback(
+                    std::function<void(SupervisionStatus)> &&callback);
             };
         }
     }

test/ara/phm/supervisors/dummy_supervision.h

@@ -13,9 +13,7 @@ namespace ara
             class DummySupervision : public ElementarySupervision
             {
             public:
-                DummySupervision() : ElementarySupervision([](SupervisionStatus status) {})
-                {
-                }
+                DummySupervision() noexcept = default;
 
                 inline void ReportStatus(SupervisionStatus status)
                 {