修正缓存策略

Author: alafighting

app/src/main/java/com/im4j/kakacache/rxjava/demo/MainActivity.java

@@ -7,10 +7,12 @@
 import android.widget.Button;
 
 import com.im4j.kakacache.rxjava.netcache.RxRemoteCache;
-import com.im4j.kakacache.rxjava.netcache.strategy.FirstCacheStrategy;
+import com.im4j.kakacache.rxjava.netcache.strategy.FirstTimeStrategy;
 
 import java.util.concurrent.TimeUnit;
 
+import rx.Observable;
+
 /**
  * Demo主界面
  * @version alafighting 2016-06
@@ -27,8 +29,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         btnTest = (Button) findViewById(R.id.btn_test_cache);
         btnTest.setOnClickListener(view -> {
-            remote().compose(RxRemoteCache.transformer(KEY_CACHE, new FirstCacheStrategy())).subscribe(data -> {
-                Log.e("main", "next  data="+data);
+            remote().compose(RxRemoteCache.transformer(KEY_CACHE, new FirstTimeStrategy())).subscribe(data -> {
+                Log.e("main", "next  data=" + data);
             }, error -> {
                 Log.e("main", "error", error);
             }, () -> {
@@ -38,6 +40,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     }
 
     private rx.Observable<String> remote() {
+        Log.e("main", "run remote1");
         return rx.Observable.just("test remote").delay(3, TimeUnit.SECONDS);
     }
 

library/src/main/java/com/im4j/kakacache/rxjava/manager/RxCacheManager.java

@@ -20,7 +20,6 @@ public final void call(Subscriber<? super T> subscriber) {
                 execute(subscriber);
             } catch (Throwable e) {
                 onError(subscriber, e);
-                return;
             }
 
             subscriber.onCompleted();

library/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/BasicCacheStrategy.java

@@ -15,14 +15,15 @@
 abstract class BasicCacheStrategy<T> implements CacheStrategy {
 
     Observable<ResultData<T>> loadCache(String key) {
+        Log.e("Strategy", "loadCache  key="+key);
         return RxRemoteCache.load(key).map(it -> new ResultData<>(ResultFrom.Cache, key, (T) it));
     }
 
     Observable<ResultData<T>> loadRemote(String key, Observable<T> source) {
         return source.map(it -> {
+            Log.e("Strategy", "save  key="+key+", value="+it);
             RxRemoteCache.save(key, it).subscribe(status -> Log.e("save status", "status="+status) );
-            Log.e("transformer", "save  key="+key+", value="+it);
-            return new ResultData<T>(ResultFrom.Remote, key, it);
+            return new ResultData<>(ResultFrom.Remote, key, it);
         });
     }
 

…etcache/strategy/FirstCacheStrategy.java …netcache/strategy/FirstTimeStrategy.javalibrary/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/FirstCacheStrategy.java renamed to library/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/FirstTimeStrategy.java library/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/FirstCacheStrategy.java renamed to library/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/FirstTimeStrategy.java

@@ -6,17 +6,17 @@
 import rx.schedulers.Schedulers;
 
 /**
- * 优先缓存
+ * 谁先响应，处理谁
  * @version alafighting 2016-06
  */
-public class FirstCacheStrategy<T> extends BasicCacheStrategy<T> {
+public class FirstTimeStrategy<T> extends BasicCacheStrategy<T> {
 
     @Override
     public Observable<ResultData<T>> execute(String key, Observable source) {
         return Observable.concat(
                 loadCache(key),
                 loadRemote(key, source)
-        ).first(it -> ((ResultData<T>)it).data != null).subscribeOn(Schedulers.io());
+        ).first(it -> ((ResultData<T>) it).data != null).subscribeOn(Schedulers.io());
     }
 
 }