From 267466be9dc9502d900354be315aabbaed50c7cc Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 15:43:58 +0200
Subject: [PATCH] pass const references to user handler now

---
 src/fsfw/cfdp/handler/DestHandler.h |  2 +-
 src/fsfw/cfdp/handler/UserBase.h    | 20 ++++++++++----------
 unittests/mocks/cfdp/UserMock.cpp   | 26 +++++++++++++++-----------
 unittests/mocks/cfdp/UserMock.h     | 20 ++++++++++----------
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/fsfw/cfdp/handler/DestHandler.h b/src/fsfw/cfdp/handler/DestHandler.h
index 706752b2b..fdf79633b 100644
--- a/src/fsfw/cfdp/handler/DestHandler.h
+++ b/src/fsfw/cfdp/handler/DestHandler.h
@@ -89,7 +89,7 @@ class DestHandler {
     cfdp::FileSize fileSize;
     TransactionId transactionId;
     PduConfig pduConf;
-    RemoteEntityCfg* remoteCfg;
+    RemoteEntityCfg* remoteCfg = nullptr;
   };
 
   TransactionStep step = TransactionStep::IDLE;
diff --git a/src/fsfw/cfdp/handler/UserBase.h b/src/fsfw/cfdp/handler/UserBase.h
index 50a00a2d3..bd26ae0de 100644
--- a/src/fsfw/cfdp/handler/UserBase.h
+++ b/src/fsfw/cfdp/handler/UserBase.h
@@ -68,9 +68,9 @@ class UserBase {
 
   explicit UserBase(HasFileSystemIF& vfs);
 
-  virtual void transactionIndication(TransactionId id) = 0;
-  virtual void eofSentIndication(TransactionId id) = 0;
-  virtual void transactionFinishedIndication(TransactionFinishedParams params) = 0;
+  virtual void transactionIndication(const TransactionId& id) = 0;
+  virtual void eofSentIndication(const TransactionId& id) = 0;
+  virtual void transactionFinishedIndication(const TransactionFinishedParams& params) = 0;
   /**
    * Will be called if metadata was received.
    *
@@ -82,13 +82,13 @@ class UserBase {
    * @param params
    */
   virtual void metadataRecvdIndication(const MetadataRecvdParams& params) = 0;
-  virtual void fileSegmentRecvdIndication(FileSegmentRecvdParams params) = 0;
-  virtual void reportIndication(TransactionId id, StatusReportIF& report) = 0;
-  virtual void suspendedIndication(TransactionId id, ConditionCode code) = 0;
-  virtual void resumedIndication(TransactionId id, size_t progress) = 0;
-  virtual void faultIndication(TransactionId id, ConditionCode code, size_t progress) = 0;
-  virtual void abandonedIndication(TransactionId id, ConditionCode code, size_t progress) = 0;
-  virtual void eofRecvIndication(TransactionId id) = 0;
+  virtual void fileSegmentRecvdIndication(const FileSegmentRecvdParams& params) = 0;
+  virtual void reportIndication(const TransactionId& id, StatusReportIF& report) = 0;
+  virtual void suspendedIndication(const TransactionId& id, ConditionCode code) = 0;
+  virtual void resumedIndication(const TransactionId& id, size_t progress) = 0;
+  virtual void faultIndication(const TransactionId& id, ConditionCode code, size_t progress) = 0;
+  virtual void abandonedIndication(const TransactionId& id, ConditionCode code, size_t progress) = 0;
+  virtual void eofRecvIndication(const TransactionId& id) = 0;
 
  private:
   HasFileSystemIF& vfs;
diff --git a/unittests/mocks/cfdp/UserMock.cpp b/unittests/mocks/cfdp/UserMock.cpp
index 2281184e2..a6b6ed482 100644
--- a/unittests/mocks/cfdp/UserMock.cpp
+++ b/unittests/mocks/cfdp/UserMock.cpp
@@ -1,17 +1,21 @@
 #include "UserMock.h"
 
+namespace cfdp {
+
 cfdp::UserMock::UserMock(HasFileSystemIF& vfs) : UserBase(vfs) {}
 
-void cfdp::UserMock::transactionIndication(cfdp::TransactionId id) {}
-void cfdp::UserMock::eofSentIndication(cfdp::TransactionId id) {}
-void cfdp::UserMock::abandonedIndication(cfdp::TransactionId id, cfdp::ConditionCode code,
+void UserMock::transactionIndication(const TransactionId& id) {}
+void UserMock::eofSentIndication(const TransactionId& id) {}
+void UserMock::abandonedIndication(const TransactionId& id, cfdp::ConditionCode code,
                                          uint64_t progress) {}
-void cfdp::UserMock::eofRecvIndication(cfdp::TransactionId id) {}
-void cfdp::UserMock::transactionFinishedIndication(TransactionFinishedParams finishedParams) {}
-void cfdp::UserMock::metadataRecvdIndication(const MetadataRecvdParams& params) {}
-void cfdp::UserMock::fileSegmentRecvdIndication(FileSegmentRecvdParams params) {}
-void cfdp::UserMock::reportIndication(TransactionId id, StatusReportIF& report) {}
-void cfdp::UserMock::suspendedIndication(TransactionId id, ConditionCode code) {}
-void cfdp::UserMock::resumedIndication(TransactionId id, size_t progress) {}
-void cfdp::UserMock::faultIndication(cfdp::TransactionId id, cfdp::ConditionCode code,
+void UserMock::eofRecvIndication(const TransactionId& id) {}
+void UserMock::transactionFinishedIndication(const TransactionFinishedParams& finishedParams) {}
+void UserMock::metadataRecvdIndication(const MetadataRecvdParams& params) {}
+void UserMock::fileSegmentRecvdIndication(const FileSegmentRecvdParams& params) {}
+void UserMock::reportIndication(const TransactionId& id, StatusReportIF& report) {}
+void UserMock::suspendedIndication(const TransactionId& id, ConditionCode code) {}
+void UserMock::resumedIndication(const TransactionId& id, size_t progress) {}
+void UserMock::faultIndication(const TransactionId& id, cfdp::ConditionCode code,
                                      size_t progress) {}
+
+}
diff --git a/unittests/mocks/cfdp/UserMock.h b/unittests/mocks/cfdp/UserMock.h
index c58210f69..f3a5bfd9a 100644
--- a/unittests/mocks/cfdp/UserMock.h
+++ b/unittests/mocks/cfdp/UserMock.h
@@ -8,17 +8,17 @@ class UserMock : public UserBase {
  public:
   explicit UserMock(HasFileSystemIF& vfs);
 
-  void transactionIndication(TransactionId id) override;
-  void eofSentIndication(TransactionId id) override;
-  void abandonedIndication(TransactionId id, ConditionCode code, size_t progress) override;
-  void eofRecvIndication(TransactionId id) override;
-  void transactionFinishedIndication(TransactionFinishedParams params) override;
+  void transactionIndication(const TransactionId& id) override;
+  void eofSentIndication(const TransactionId& id) override;
+  void abandonedIndication(const TransactionId& id, ConditionCode code, size_t progress) override;
+  void eofRecvIndication(const TransactionId& id) override;
+  void transactionFinishedIndication(const TransactionFinishedParams& params) override;
   void metadataRecvdIndication(const MetadataRecvdParams& params) override;
-  void fileSegmentRecvdIndication(FileSegmentRecvdParams params) override;
-  void reportIndication(TransactionId id, StatusReportIF& report) override;
-  void suspendedIndication(TransactionId id, ConditionCode code) override;
-  void resumedIndication(TransactionId id, size_t progress) override;
-  void faultIndication(TransactionId id, ConditionCode code, size_t progress) override;
+  void fileSegmentRecvdIndication(const FileSegmentRecvdParams& params) override;
+  void reportIndication(const TransactionId& id, StatusReportIF& report) override;
+  void suspendedIndication(const TransactionId& id, ConditionCode code) override;
+  void resumedIndication(const TransactionId& id, size_t progress) override;
+  void faultIndication(const TransactionId& id, ConditionCode code, size_t progress) override;
 };
 
 }  // namespace cfdp