增加响应默认值；修正日志打印

Author: alafighting

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

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

@@ -1,5 +1,7 @@
 package com.im4j.kakacache.rxjava.manager;
 
+import android.util.Log;
+
 import com.im4j.kakacache.rxjava.common.exception.CacheException;
 import com.im4j.kakacache.rxjava.core.CacheCore;
 import com.im4j.kakacache.rxjava.core.CacheTarget;
@@ -41,14 +43,15 @@ public <T> rx.Observable<T> load(final String key) {
         return rx.Observable.create(new SimpleSubscribe<T>() {
             @Override
             void execute(Subscriber<? super T> subscriber) {
+                Log.e("CacheManager", "loadCache  key="+key);
                 T value = _load(key);
                 subscriber.onNext(value);
             }
             @Override
             void onError(Subscriber<? super T> subscriber, Throwable e) {
                 subscriber.onNext(null);
             }
-        }).subscribeOn(Schedulers.computation());
+        });
     }
 
     /**

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

@@ -15,13 +15,14 @@
 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));
+        return RxRemoteCache.load(key).map(it -> {
+            Log.e("Strategy", "loadCache result="+it);
+            return 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) );
             return new ResultData<>(ResultFrom.Remote, key, it);
         });

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

@@ -9,14 +9,14 @@
  * 谁先响应，处理谁
  * @version alafighting 2016-06
  */
-public class FirstTimeStrategy<T> extends BasicCacheStrategy<T> {
+public class FirstCacheStrategy<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());
+        ).firstOrDefault(null, it -> ((ResultData<T>)it.data) != null).subscribeOn(Schedulers.io());
     }
 
 }