run auto-formatter

src/fsfw/util/ObjectId.h

@@ -1,57 +1,38 @@
 #ifndef FSFW_UTIL_OBJECTID_H
 #define FSFW_UTIL_OBJECTID_H
 
-#include "fsfw/objectmanager.h"
-#include "UnsignedByteField.h"
-
 #include <functional>
 
+#include "UnsignedByteField.h"
+#include "fsfw/objectmanager.h"
+
 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 {
+  [[nodiscard]] const char* name() const { return name_; }
-    return name_;
-  }
 
-  [[nodiscard]] object_id_t id() const {
+  [[nodiscard]] object_id_t id() const { return getValue(); }
-    return getValue();
-  }
 
-  bool operator==(const ObjectId& other) const {
+  bool operator==(const ObjectId& other) const { return id() == other.id(); }
-    return id() == other.id();
-  }
 
-  bool operator!=(const ObjectId& other) const {
+  bool operator!=(const ObjectId& other) const { return id() != other.id(); }
-    return id() != other.id();
-  }
 
-  bool operator<(const ObjectId& other) const {
+  bool operator<(const ObjectId& other) const { return id() < other.id(); }
-    return id() < other.id();
-  }
 
-  bool operator>(const ObjectId& other) const {
+  bool operator>(const ObjectId& other) const { return id() > other.id(); }
-    return id() > other.id();
-  }
 
-  bool operator>=(const ObjectId& other) const {
+  bool operator>=(const ObjectId& other) const { return id() >= other.id(); }
-    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>
+struct std::hash<ObjectId> {
-{
+  std::size_t operator()(ObjectId const& s) const noexcept { return std::hash<uint32_t>{}(s.id()); }
-  std::size_t operator()(ObjectId const& s) const noexcept
-  {
-    return std::hash<uint32_t>{}(s.id());
-  }
 };
 
 #endif  // FSFW_UTIL_OBJECTID_H

src/fsfw/util/UnsignedByteField.h

@@ -19,17 +19,12 @@ class UnsignedByteField: public SerializeIF {
     return SerializeAdapter::deSerialize(&value, buffer, size, streamEndianness);
   }
 
-  [[nodiscard]] size_t getSerializedSize() const override {
+  [[nodiscard]] size_t getSerializedSize() const override { return sizeof(T); }
-    return sizeof(T);
-  }
 
-  [[nodiscard]] T getValue() const {
+  [[nodiscard]] T getValue() const { return value; }
-    return value;
+
-  }
+  void setValue(T value_) { value = value_; }
 
-  void setValue(T value_) {
-    value = value_;
-  }
  private:
   T value;
 };

unittests/util/testObjectId.cpp

@@ -1,7 +1,7 @@
+#include <array>
 #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");

unittests/util/testUnsignedByteField.cpp

@@ -1,10 +1,9 @@
 
+#include <array>
 #include <catch2/catch_test_macros.hpp>
 
 #include "fsfw/util/UnsignedByteField.h"
 
-#include <array>
-
 TEST_CASE("Unsigned Byte Field", "[unsigned-byte-field]") {
   auto testByteField = UnsignedByteField<uint32_t>(10);
   auto u32ByteField = U32ByteField(10);
@@ -28,7 +27,8 @@ TEST_CASE("Unsigned Byte Field", "[unsigned-byte-field]") {
   }
 
   SECTION("Serialize U32") {
-    CHECK(testByteField.serializeBe(buf.data(), serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    CHECK(testByteField.serializeBe(buf.data(), serLen, buf.size()) ==
+          HasReturnvaluesIF::RETURN_OK);
     CHECK(serLen == 4);
     CHECK(buf[0] == 0);
     CHECK(buf[3] == 10);
@@ -60,7 +60,8 @@ TEST_CASE("Unsigned Byte Field", "[unsigned-byte-field]") {
     buf[2] = 0x30;
     buf[3] = 0x20;
     size_t deserLen = 0;
-    CHECK(testByteField.deSerializeBe(buf.data(), deserLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    CHECK(testByteField.deSerializeBe(buf.data(), deserLen, buf.size()) ==
+          HasReturnvaluesIF::RETURN_OK);
     CHECK(testByteField.getValue() == 0x50403020);
   }
 
@@ -68,7 +69,8 @@ TEST_CASE("Unsigned Byte Field", "[unsigned-byte-field]") {
     buf[0] = 0x50;
     buf[1] = 0x40;
     size_t deserLen = 0;
-    CHECK(u16ByteField.deSerializeBe(buf.data(), deserLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    CHECK(u16ByteField.deSerializeBe(buf.data(), deserLen, buf.size()) ==
+          HasReturnvaluesIF::RETURN_OK);
     CHECK(u16ByteField.getValue() == 0x5040);
   }
 }