Renamed function add to set.

Small fixes.

Author: pcpl2

simplecache/src/androidTest/java/com/github/pcpl2/simplecache/SimpleCacheTest.kt

@@ -2,6 +2,7 @@ package com.github.pcpl2.simplecache
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
+import android.util.Log
 import com.github.pcpl2.simplecache.models.TestObject
 
 import org.junit.Test
@@ -26,71 +27,71 @@ class SimpleCacheTest {
 
         val cacheManager = CacheManager.createInstance(appContext, null)
 
-        cacheManager.add("String", "Hello World")
-        cacheManager.add("Int", 255)
-        cacheManager.add("Bool", false)
-        cacheManager.add("float", 5.55)
+        cacheManager.set("String", "Hello World")
+        cacheManager.set("Int", 255)
+        cacheManager.set("Bool", false)
+        cacheManager.set("float", 5.55)
         val testMap = HashMap<String, String>()
         testMap["testKey"] = "TestValue"
-        cacheManager.add("map", testMap)
+        cacheManager.set("map", testMap)
         val testObject = TestObject(69, "abababa", false, 6.66f, testMap)
-        cacheManager.add("obj", testObject)
+        cacheManager.set("obj", testObject)
         val testObject2 = TestObject(885, "Testing two!", true, 3.14f, testMap)
 
-        cacheManager.add("obj2", testObject2)
+        cacheManager.set("obj2", testObject2)
 
         cacheManager.get(key = "String", success = { value, type ->
             assertEquals("Hello World", value)
-            assert(type!!.isInstance(String::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(String::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
-        cacheManager.get(key = "Int", success = { value, type ->
+        cacheManager.get(key = "Int", checkExpired = true, success = { value, type ->
             assertEquals(255, value)
-            assert(type!!.isInstance(Int::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(Int::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.get(key = "Bool", success = { value, type ->
             assertEquals(false, value)
-            assert(type!!.isInstance(Boolean::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(Boolean::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.get(key = "float", success = { value, type ->
             assertEquals(5.55, value)
-            assert(type!!.isInstance(Float::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(Float::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.get(key = "map", success = { value, type ->
             assertEquals(testMap, value)
-            assert(type!!.isInstance(HashMap::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(HashMap::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.get(key = "obj", success = { value, type ->
             assertEquals(testObject, value)
-            assert(type!!.isInstance(TestObject::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(TestObject::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.get(key = "obj2", success = { value, type ->
             assertEquals(testObject2, value)
-            assert(type!!.isInstance(TestObject::class))
-            System.out.println(value.toString())
+            assert(type.isInstance(TestObject::class))
+            Log.d("simpleCacheTest", value.toString())
         })
 
         cacheManager.remove("obj2")
 
         cacheManager.get(key = "obj2", success = { _,  _ ->
 
         }, error = {
-            System.out.println("obj2 is not exist.")
+            Log.d("simpleCacheTest", "obj2 is not exist.")
             assert(true)
         })
 
-        System.out.println(CacheManager.getListOfCacheFiles(appContext).toString())
+        Log.d("simpleCacheTest", CacheManager.getListOfCacheFiles(appContext).toString())
 
         assertEquals("com.github.pcpl2.simplecache.test", appContext.packageName)
     }

simplecache/src/main/java/com/github/pcpl2/simplecache/CacheManagerImpl.kt

@@ -47,13 +47,13 @@ class CacheManagerImpl(private val context: Context, fileName: String?) {
     }
 
     /**
-     * Add element to cache.
+     * Add or update element in cache.
      *
      * @param key The key under which the added element will be available.
      * @param value Element that is added. can be of any type.
      * @param lifeTime Element lifetime in cache (given in seconds). If it is zero then there is no life time.
      */
-    fun add(key: String, value: Any, lifeTime: Long = 0) {
+    fun set(key: String, value: Any, lifeTime: Long = 0) {
         backgroundSaveFileThread?.join()
         val cacheEntry = CacheEntry(ts = DateTime.now(), lifeTime = lifeTime, value = value, type = value.javaClass.name)
         cahceMap[key] = cacheEntry
@@ -68,11 +68,10 @@ class CacheManagerImpl(private val context: Context, fileName: String?) {
      * @param success Callback returning element and element type from cache. If it does not exist, the element and type returned are null.
      * @param error Callback running if element with key not exist in map or lifetime of element is end.
      */
-    fun get(key: String, checkExpired: Boolean = true, success: (value: Any?, type: Class<*>?) -> Unit, error: (() -> Unit)? = null) {
+    fun get(key: String, checkExpired: Boolean = true, success: (value: Any, type: Class<*>) -> Unit, error: (() -> Unit)? = null) {
         backgroundReadFileThread?.join()
 
         val entry = cahceMap[key]
-
         if (entry != null) {
             val classType = Class.forName(entry.type)
             val valueTyped = classType.cast(entry.value)
@@ -121,8 +120,8 @@ class CacheManagerImpl(private val context: Context, fileName: String?) {
         backgroundSaveFileThread?.join()
         backgroundSaveFileThread = Thread(Runnable {
             Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND)
-            val json = gson.toJson(cahceMap)
-            Log.d("SaveJson", json)
+            val json = gson.toJson(cahceMap.toMap())
+            //Log.d("SaveJson", json)
             val file = File(context.cacheDir, "${CacheManager.directoryName}${File.separator}$filename")
             val fw = FileWriter(file.absoluteFile)
             val bw = BufferedWriter(fw)