瀏覽代碼

Renamed cache interface method names

Vadik Sirekanyan 7 年之前
父節點
當前提交
f4272597a4

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/BookRepository.kt

@@ -82,9 +82,9 @@ class BookRepositoryImpl(
             }
 
     override fun findCached(): Maybe<List<BookModel>> =
-        cache.getFromJson(CacheKey.BOOKS, genericType<List<BookModel>>())
+        cache.find(CacheKey.BOOKS, genericType<List<BookModel>>())
 
     override fun saveToCache(data: List<BookModel>): Completable =
-        cache.saveToJson(CacheKey.BOOKS, data)
+        cache.save(CacheKey.BOOKS, data)
 
 }

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/NoteRepository.kt

@@ -30,9 +30,9 @@ class NoteRepositoryImpl(
         api.getLatestBooksWithNotes().map { it.values.map { it.toNoteModel() } }
 
     override fun findCached(): Maybe<List<NoteModel>> =
-        cache.getFromJson(CacheKey.NOTES, genericType<List<NoteModel>>())
+        cache.find(CacheKey.NOTES, genericType<List<NoteModel>>())
 
     override fun saveToCache(data: List<NoteModel>): Completable =
-        cache.saveToJson(CacheKey.NOTES, data)
+        cache.save(CacheKey.NOTES, data)
 
 }

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/UserRepository.kt

@@ -31,9 +31,9 @@ class UserRepositoryImpl(
         api.getSubscriptions(auth.getAccessToken()).map { it.map { it.toUserModel() } }
 
     override fun findCached(): Maybe<List<UserModel>> =
-        cache.getFromJson(CacheKey.USERS, genericType<List<UserModel>>())
+        cache.find(CacheKey.USERS, genericType<List<UserModel>>())
 
     override fun saveToCache(data: List<UserModel>): Completable =
-        cache.saveToJson(CacheKey.USERS, data)
+        cache.save(CacheKey.USERS, data)
 
 }

+ 4 - 4
app/src/main/java/com/sirekanyan/knigopis/repository/cache/CommonCache.kt

@@ -14,9 +14,9 @@ inline fun <reified T> genericType(): Type = object : TypeToken<T>() {}.type
 
 interface CommonCache {
 
-    fun <T> saveToJson(key: CacheKey, books: List<T>): Completable
+    fun <T> save(key: CacheKey, books: List<T>): Completable
 
-    fun <T> getFromJson(key: CacheKey, type: Type): Maybe<T>
+    fun <T> find(key: CacheKey, type: Type): Maybe<T>
 
 }
 
@@ -27,14 +27,14 @@ class CommonCacheImpl(
 
     private val prefs = context.getSharedPreferences(COMMON_PREFS_NAME, MODE_PRIVATE)
 
-    override fun <T> getFromJson(key: CacheKey, type: Type): Maybe<T> =
+    override fun <T> find(key: CacheKey, type: Type): Maybe<T> =
         Maybe.fromCallable {
             prefs.getString(key.storeValue, null)?.let { json ->
                 gson.fromJson<T>(json, type)
             }
         }
 
-    override fun <T> saveToJson(key: CacheKey, books: List<T>): Completable =
+    override fun <T> save(key: CacheKey, books: List<T>): Completable =
         Completable.fromAction {
             prefs.edit()
                 .putString(key.storeValue, gson.toJson(books))