update methods

Author: 7bitcoder

Source/Library/Cache.cpp

@@ -26,7 +26,7 @@ namespace sd
         return nullptr;
     }
 
-    bool Cache::Set(std::unique_ptr<ICacheItem> itemPtr, std::unique_ptr<ICachePolicy> policy)
+    bool Cache::Set(std::unique_ptr<ICacheItem> itemPtr, std::unique_ptr<ICachePolicy> newPolicy)
     {
         if (!itemPtr)
         {
@@ -37,14 +37,17 @@ namespace sd
         {
             return false;
         }
-        itemPtr.swap(data->item);
-        if (data->policy && data->item && itemPtr)
+        std::swap(itemPtr, data->item);
+        auto &oldItem = itemPtr;
+        auto &newItem = data->item;
+        auto &oldPolicy = data->policy;
+        if (oldPolicy && oldItem && newItem)
         {
-            data->policy->CallOnUpdate(itemPtr->GetValue(), data->item->GetValue());
+            oldPolicy->CallOnUpdate(oldItem->GetValue(), newItem->GetValue());
         }
-        if (policy)
+        if (newPolicy)
         {
-            data->policy = std::move(policy);
+            data->policy = std::move(newPolicy);
         }
         return true;
     }

Source/Library/h/Cache.hpp

@@ -125,6 +125,13 @@ namespace sd
             return Add(CacheItem<TValue>::Make(key, std::move(value)), std::move(policy));
         }
 
+        template <class TValue>
+        bool Add(std::unique_ptr<CacheItem<TValue>> itemPtr, std::unique_ptr<CachePolicy<TValue>> policy = nullptr)
+        {
+            std::unique_ptr<ICacheItem> itemPtrCasted = std::move(itemPtr);
+            return Add(std::move(itemPtrCasted), std::move(policy));
+        }
+
         bool Add(std::unique_ptr<ICacheItem> itemPtr, std::unique_ptr<ICachePolicy> policy = nullptr) final;
 
         template <class TValue>
@@ -138,7 +145,8 @@ namespace sd
         const TValue *AddOrGetExisting(std::unique_ptr<CacheItem<TValue>> itemPtr,
                                        std::unique_ptr<CachePolicy<TValue>> policy = nullptr)
         {
-            return static_cast<const TValue *>(AddOrGetExisting(std::move(itemPtr), std::move(policy)));
+            std::unique_ptr<ICacheItem> itemPtrCasted = std::move(itemPtr);
+            return static_cast<const TValue *>(AddOrGetExisting(std::move(itemPtrCasted), std::move(policy)));
         }
 
         const void *AddOrGetExisting(std::unique_ptr<ICacheItem> itemPtr,
@@ -153,7 +161,8 @@ namespace sd
         template <class TValue>
         bool Set(std::unique_ptr<CacheItem<TValue>> itemPtr, std::unique_ptr<CachePolicy<TValue>> policy = nullptr)
         {
-            return Set(std::move(itemPtr), std::move(policy));
+            std::unique_ptr<ICacheItem> itemPtrCasted = std::move(itemPtr);
+            return Set(std::move(itemPtrCasted), std::move(policy));
         }
 
         bool Set(std::unique_ptr<ICacheItem> itemPtr, std::unique_ptr<ICachePolicy> policy = nullptr) final;

Tests/CacheTest.cpp

@@ -5,6 +5,8 @@
 #include <thread>
 #include <utility>
 
+using namespace std::string_literals;
+
 class CacheTest : public ::testing::Test
 {
   protected:
@@ -26,7 +28,7 @@ TEST_F(CacheTest, AddTest)
     sd::Cache cache;
 
     auto intItem = sd::CacheItem<int>::Make("int", 12);
-    auto stringItem = sd::CacheItem<std::string>::Make("string", std::string("hello"));
+    auto stringItem = sd::CacheItem<std::string>::Make("string", "hello"s);
     auto boolItem = sd::CacheItem<bool>::Make("bool", false);
     auto boolItem2 = sd::CacheItem<bool>::Make("bool", true);
 
@@ -41,7 +43,7 @@ TEST_F(CacheTest, AddDirectTest)
     sd::Cache cache;
 
     EXPECT_TRUE(cache.Add("int", 12));
-    EXPECT_TRUE(cache.Add("string", std::string("hello")));
+    EXPECT_TRUE(cache.Add("string", "hello"s));
     EXPECT_TRUE(cache.Add("bool", true));
     EXPECT_FALSE(cache.Add("bool", false));
 }
@@ -51,7 +53,7 @@ TEST_F(CacheTest, CountTest)
     sd::Cache cache;
 
     cache.Add("int", 12);
-    cache.Add("string", std::string("hello"));
+    cache.Add("string", "hello"s);
     cache.Add("bool", true);
     cache.Add("bool", false);
 
@@ -63,7 +65,7 @@ TEST_F(CacheTest, ContainsTest)
     sd::Cache cache;
 
     cache.Add("int", 12);
-    cache.Add("string", std::string("hello"));
+    cache.Add("string", "hello"s);
     cache.Add("bool", true);
     cache.Add("bool", false);
 
@@ -85,7 +87,7 @@ TEST_F(CacheTest, GetTest)
     sd::Cache cache;
 
     cache.Add("int", 12);
-    cache.Add("string", std::string("hello"));
+    cache.Add("string", "hello"s);
     cache.Add("bool", false);
 
     EXPECT_EQ(*cache.Get<int>("int"), 12);
@@ -98,7 +100,7 @@ TEST_F(CacheTest, RemoveTest)
     sd::Cache cache;
 
     cache.Add("int", 12);
-    cache.Add("string", std::string("hello"));
+    cache.Add("string", "hello"s);
     cache.Add("bool", false);
 
     EXPECT_TRUE(cache.Remove("int"));