Maintenance

Bigfoot/Sources/System/Include/System/UUID/UUID.hpp

@@ -34,19 +34,33 @@ class UUID
     UUID(const UUID& p_uuid) = default;
     UUID(UUID&& p_uuid) noexcept = default;
 
+    /**
+     * Gets the raw bytes of a UUID
+     *
+     * \return A view to the raw bytes
+     */
+    [[nodiscard]]
+    std::span<const std::byte, UUID_BYTE_SIZE> ToBytes() const;
+
+    /**
+     * Gets the string representation of a UUID
+     *
+     * \return A string representing the UUID
+     */
+    [[nodiscard]]
+    std::string ToString() const;
+
     ~UUID() = default;
 
-    operator std::span<const std::byte, UUID_BYTE_SIZE>() const;
-    operator std::string() const;
     operator bool() const;
 
     UUID& operator=(const UUID& p_uuid) = default;
     UUID& operator=(UUID&& p_uuid) noexcept = default;
 
     [[nodiscard]]
-    bool operator==(const UUID& p_uuid) const = default;
+    bool operator==(const UUID& p_uuid) const;
     [[nodiscard]]
-    bool operator<(const UUID& p_uuid) const = default;
+    bool operator<(const UUID& p_uuid) const;
 
   private:
     /**
@@ -130,7 +144,7 @@ struct fmtquill::formatter<Bigfoot::UUID>
 
     auto format(const Bigfoot::UUID& p_uuid, format_context& ctx) const
     {
-        return fmtquill::format_to(ctx.out(), "{}", static_cast<std::string>(p_uuid));
+        return fmtquill::format_to(ctx.out(), "{}", p_uuid.ToString());
     }
 };
 

Bigfoot/Sources/System/UUID/UUID.cpp

@@ -43,14 +43,14 @@ UUID::UUID(const std::span<const std::byte, UUID_BYTE_SIZE> p_raw)
 
 /****************************************************************************************/
 
-UUID::operator std::span<const std::byte, UUID::UUID_BYTE_SIZE>() const
+std::span<const std::byte, UUID::UUID_BYTE_SIZE> UUID::ToBytes() const
 {
     return m_uuid.as_bytes();
 }
 
 /****************************************************************************************/
 
-UUID::operator std::string() const
+std::string UUID::ToString() const
 {
     return uuids::to_string(m_uuid);
 }
@@ -62,6 +62,18 @@ UUID::operator bool() const
     return *this != NULL_UUID;
 }
 
+bool UUID::operator==(const UUID& p_uuid) const
+{
+    return m_uuid == p_uuid.m_uuid;
+}
+
+/****************************************************************************************/
+
+bool UUID::operator<(const UUID& p_uuid) const
+{
+    return m_uuid < p_uuid.m_uuid;
+}
+
 /****************************************************************************************/
 
 std::mt19937 UUID::GetRandomGenerator()
@@ -87,7 +99,7 @@ namespace flatbuffers
 {
 Flat::Bigfoot::UUID Pack(const Bigfoot::UUID& p_uuid)
 {
-    const std::span<const std::byte, Bigfoot::UUID::UUID_BYTE_SIZE> bytes = p_uuid;
+    const std::span<const std::byte, Bigfoot::UUID::UUID_BYTE_SIZE> bytes = p_uuid.ToBytes();
     return Flat::Bigfoot::UUID {
       std::span<const std::uint8_t, Bigfoot::UUID::UUID_BYTE_SIZE> {reinterpret_cast<const std::uint8_t*>(bytes.data()),
                                                                     bytes.size()}};

Bigfoot/Sources/Utils/Include/Utils/Version.hpp

@@ -86,13 +86,24 @@ class Version
         return static_cast<std::uint8_t>(m_combined & mask);
     }
 
+    /**
+     * Gets the raw Version
+     *
+     * \return the raw version
+     */
     [[nodiscard]]
-    constexpr operator std::uint32_t() const
+    constexpr std::uint32_t Raw() const
     {
         return m_combined;
     }
 
-    operator std::string() const;
+    /**
+     * Gets the string representation of the Version
+     *
+     * \return The string
+     */
+    [[nodiscard]]
+    std::string ToString() const;
 
     constexpr Version& operator=(const Version& p_version) = default;
     constexpr Version& operator=(Version&& p_version) = default;
@@ -123,7 +134,7 @@ struct std::formatter<Bigfoot::Version>
     template<typename FormatContext>
     auto format(const Bigfoot::Version& p_version, FormatContext& p_context) const
     {
-        return std::format_to(p_context.out(), "{}", static_cast<std::string>(p_version));
+        return std::format_to(p_context.out(), "{}", p_version.ToString());
     }
 };
 #endif

Bigfoot/Sources/Utils/Version.cpp

@@ -8,7 +8,7 @@
 
 namespace Bigfoot
 {
-Version::operator std::string() const
+std::string Version::ToString() const
 {
     return std::format("{}.{}.{}", GetMajor(), GetMinor(), GetPatch());
 }

Bigfoot/Tests/Engine/BigFile/BigFile.cpp

@@ -53,37 +53,37 @@ TEST_F(BigFileFixture, BigFileManipulation)
         BigFile::Request assetHeaderRequest {
           m_bigFile,
           "INSERT INTO AssetHeader (UUID, Name, TypeID, TypeName) VALUES(?, ?, ?, ?)"};
-        assetHeaderRequest.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid));
+        assetHeaderRequest.Bind(1, uuid.ToBytes());
         assetHeaderRequest.Bind(2, "Test");
         assetHeaderRequest.Bind(3, typeIDRef);
         assetHeaderRequest.Bind(4, "TypeTest");
 
         BigFile::Request assetRequest {m_bigFile, "INSERT INTO Asset (UUID, Asset) VALUES(?, ?)"};
-        assetRequest.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid));
+        assetRequest.Bind(1, uuid.ToBytes());
         assetRequest.Bind(2, blob);
 
         BigFile::Request assetHeaderRequest2 {
           m_bigFile,
           "INSERT INTO AssetHeader (UUID, Name, TypeID, TypeName) VALUES(?, ?, ?, ?)"};
-        assetHeaderRequest2.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid2));
+        assetHeaderRequest2.Bind(1, uuid2.ToBytes());
         assetHeaderRequest2.Bind(2, "Test2");
         assetHeaderRequest2.Bind(3, typeIDRef);
         assetHeaderRequest2.Bind(4, "TypeTest");
 
         BigFile::Request assetRequest2 {m_bigFile, "INSERT INTO Asset (UUID, Asset) VALUES(?, ?)"};
-        assetRequest2.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid2));
+        assetRequest2.Bind(1, uuid2.ToBytes());
         assetRequest2.Bind(2, blob3);
 
         BigFile::Request assetHeaderRequest3 {
           m_bigFile,
           "INSERT INTO AssetHeader (UUID, Name, TypeID, TypeName) VALUES(?, ?, ?, ?)"};
-        assetHeaderRequest3.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid3));
+        assetHeaderRequest3.Bind(1, uuid3.ToBytes());
         assetHeaderRequest3.Bind(2, "Test3");
         assetHeaderRequest3.Bind(3, typeIDRef);
         assetHeaderRequest3.Bind(4, "TypeTest");
 
         BigFile::Request assetRequest3 {m_bigFile, "INSERT INTO Asset (UUID, Asset) VALUES(?, ?)"};
-        assetRequest3.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid3));
+        assetRequest3.Bind(1, uuid3.ToBytes());
         assetRequest3.Bind(2, blob4);
 
         m_bigFile.BeginTransaction();
@@ -108,7 +108,7 @@ TEST_F(BigFileFixture, BigFileManipulation)
     {
         BigFile::Request updateAsset {m_bigFile, "UPDATE Asset SET Asset = ? WHERE UUID = ?"};
         updateAsset.Bind(1, blob2);
-        updateAsset.Bind(2, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid));
+        updateAsset.Bind(2, uuid.ToBytes());
 
         m_bigFile.BeginTransaction();
         std::uint32_t updateAssetChangedCount = updateAsset.Execute();
@@ -120,7 +120,7 @@ TEST_F(BigFileFixture, BigFileManipulation)
         BigFile::Request request {
           m_bigFile,
           "SELECT Name, TypeID, TypeName, CreateTime, ModificationTime FROM AssetHeader WHERE UUID = ?"};
-        request.Bind(1, static_cast<std::span<const std::byte, UUID::UUID_BYTE_SIZE>>(uuid));
+        request.Bind(1, uuid.ToBytes());
 
         const bool get = request.Step();
         EXPECT_TRUE(get);

Bigfoot/Tests/System/UUID/UUID.cpp

@@ -43,13 +43,13 @@ class UUIDFixture: public ::testing::Test
 
 TEST_F(UUIDFixture, DumpingRawAndConstructAnUUIDWithItShouldGiveTheSameUUID)
 {
-    std::span<const std::byte, UUID::UUID_BYTE_SIZE> raw = m_a;
+    std::span<const std::byte, UUID::UUID_BYTE_SIZE> raw = m_a.ToBytes();
     EXPECT_EQ(m_a, UUID {raw});
 
-    raw = m_b;
+    raw = m_b.ToBytes();
     EXPECT_EQ(m_b, UUID {raw});
 
-    raw = m_d;
+    raw = m_d.ToBytes();
     EXPECT_EQ(m_d, UUID {raw});
 }
 
@@ -57,21 +57,21 @@ TEST_F(UUIDFixture, DumpingRawAndConstructAnUUIDWithItShouldGiveTheSameUUID)
 
 TEST_F(UUIDFixture, ValidIDFromStringShouldBeEqualToString)
 {
-    EXPECT_EQ(static_cast<std::string>(m_b), "47183823-2574-4bfd-b411-99ed177d3e43");
+    EXPECT_EQ(m_b.ToString(), "47183823-2574-4bfd-b411-99ed177d3e43");
 }
 
 /****************************************************************************************/
 
 TEST_F(UUIDFixture, InvalidIDFromStringShouldNotBeEqualToString)
 {
-    EXPECT_NE(static_cast<std::string>(m_c), "4bfd-b411-99ed177d3e43");
+    EXPECT_NE(m_c.ToString(), "4bfd-b411-99ed177d3e43");
 }
 
 /****************************************************************************************/
 
 TEST_F(UUIDFixture, NullIDStringShouldBeEqualToNullIDString)
 {
-    EXPECT_EQ(static_cast<std::string>(UUID::NULL_UUID), "00000000-0000-0000-0000-000000000000");
+    EXPECT_EQ(UUID::NULL_UUID.ToString(), "00000000-0000-0000-0000-000000000000");
 }
 
 /****************************************************************************************/
@@ -168,9 +168,9 @@ TEST_F(UUIDFixture, GeneratingFiveMillionUniqueID)
 
 /****************************************************************************************/
 
-TEST_F(UUIDFixture, Raw_ShouldGiveBackTheRawDataOfTheID)
+TEST_F(UUIDFixture, ToBytes_ShouldGiveBackTheRawDataOfTheID)
 {
-    std::span<const std::byte, UUID::UUID_BYTE_SIZE> d = m_d;
+    std::span<const std::byte, UUID::UUID_BYTE_SIZE> d = m_d.ToBytes();
     std::span<const std::byte, UUID::UUID_BYTE_SIZE> raw = m_raw;
 
     for (std::uint32_t i = 0; i < UUID::UUID_BYTE_SIZE; ++i)

Bigfoot/Tests/Utils/Version.cpp

@@ -19,18 +19,18 @@ class VersionFixture: public ::testing::Test
 
 /****************************************************************************************/
 
-TEST_F(VersionFixture, string)
+TEST_F(VersionFixture, ToString)
 {
-    EXPECT_STREQ(static_cast<std::string>(m_detailed).data(), "1.2.3");
-    EXPECT_STREQ(static_cast<std::string>(m_combined).data(), "1.2.3");
+    EXPECT_STREQ(m_detailed.ToString().data(), "1.2.3");
+    EXPECT_STREQ(m_combined.ToString().data(), "1.2.3");
 }
 
 /****************************************************************************************/
 
-TEST_F(VersionFixture, uint32_t)
+TEST_F(VersionFixture, Raw)
 {
-    EXPECT_EQ(static_cast<std::uint32_t>(m_detailed), (1 << 16) | (2 << 8) | 3);
-    EXPECT_EQ(static_cast<std::uint32_t>(m_combined), (1 << 16) | (2 << 8) | 3);
+    EXPECT_EQ(m_detailed.Raw(), (1 << 16) | (2 << 8) | 3);
+    EXPECT_EQ(m_combined.Raw(), (1 << 16) | (2 << 8) | 3);
 }
 
 /****************************************************************************************/