From ca2efb60218b85414bc3857d1ce57a6f798f6c23 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 15 Aug 2022 15:02:05 +0200
Subject: [PATCH] remove object ID

---
 src/fsfw/util/ObjectId.h        | 57 ---------------------------------
 unittests/util/CMakeLists.txt   |  1 -
 unittests/util/testObjectId.cpp | 26 ---------------
 3 files changed, 84 deletions(-)
 delete mode 100644 src/fsfw/util/ObjectId.h
 delete mode 100644 unittests/util/testObjectId.cpp

diff --git a/src/fsfw/util/ObjectId.h b/src/fsfw/util/ObjectId.h
deleted file mode 100644
index 5b1cf461..00000000
--- a/src/fsfw/util/ObjectId.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef FSFW_UTIL_OBJECTID_H
-#define FSFW_UTIL_OBJECTID_H
-
-#include "fsfw/objectmanager.h"
-#include "UnsignedByteField.h"
-
-#include <functional>
-
-class ObjectId: public UnsignedByteField<object_id_t> {
- public:
-  ObjectId(object_id_t id, const char* name): UnsignedByteField<object_id_t>(id), name_(name) {}
-
-  [[nodiscard]] const char* name() const {
-    return name_;
-  }
-
-  [[nodiscard]] object_id_t id() const {
-    return getValue();
-  }
-
-  bool operator==(const ObjectId& other) const {
-    return id() == other.id();
-  }
-
-  bool operator!=(const ObjectId& other) const {
-    return id() != other.id();
-  }
-
-  bool operator<(const ObjectId& other) const {
-    return id() < other.id();
-  }
-
-  bool operator>(const ObjectId& other) const {
-    return id() > other.id();
-  }
-
-  bool operator>=(const ObjectId& other) const {
-    return id() >= other.id();
-  }
-
-  bool operator<=(const ObjectId& other) const {
-    return id() <= other.id();
-  }
- private:
-  const char* name_;
-};
-
-template<>
-struct std::hash<ObjectId>
-{
-  std::size_t operator()(ObjectId const& s) const noexcept
-  {
-    return std::hash<object_id_t>{}(s.id());
-  }
-};
-
-#endif  // FSFW_UTIL_OBJECTID_H
diff --git a/unittests/util/CMakeLists.txt b/unittests/util/CMakeLists.txt
index b79b77db..d4caa4d5 100644
--- a/unittests/util/CMakeLists.txt
+++ b/unittests/util/CMakeLists.txt
@@ -1,4 +1,3 @@
 target_sources(${FSFW_TEST_TGT} PRIVATE
   testUnsignedByteField.cpp
-  testObjectId.cpp
 )
diff --git a/unittests/util/testObjectId.cpp b/unittests/util/testObjectId.cpp
deleted file mode 100644
index cead2c15..00000000
--- a/unittests/util/testObjectId.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <catch2/catch_test_macros.hpp>
-
-#include "fsfw/util/ObjectId.h"
-#include <array>
-
-TEST_CASE("Object Id", "[object-id]") {
-    auto objectId = ObjectId(10, "TEST_ID");
-    std::map<ObjectId, int> testMap;
-
-    SECTION("State") {
-      CHECK(objectId.id() == 10);
-      CHECK(std::strcmp(objectId.name(), "TEST_ID") == 0);
-    }
-
-    SECTION("ID as map key") {
-      auto insertPair = testMap.emplace(objectId, 10);
-      CHECK(insertPair.second);
-      auto iter = testMap.find(objectId);
-      CHECK(iter != testMap.end());
-      CHECK(std::strcmp(iter->first.name(), "TEST_ID") == 0);
-      CHECK(iter->second == 10);
-      auto otherIdSameName = ObjectId(12, "TEST_ID");
-      insertPair = testMap.emplace(otherIdSameName, 10);
-      CHECK(insertPair.second);
-    }
-}
\ No newline at end of file