增加对Retrofit缓存注解@Cache的支持

Author: alafighting

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

@@ -1,16 +1,22 @@
 package com.im4j.kakacache.rxjava.demo;
 
+import com.im4j.kakacache.rxjava.netcache.CACHE;
+import com.im4j.kakacache.rxjava.netcache.ResultData;
+
 import java.util.List;
 
 import retrofit2.http.GET;
 import retrofit2.http.Path;
+import retrofit2.http.Query;
 
 /**
  * @version alafighting 2016-07
  */
 public interface GitHubService {
 
     @GET("users/{user}/repos")
-    rx.Observable<List<GithubRepoEntity>> listRepos(@Path("user") String user);
+    @CACHE("cache_key_listRepos")
+    rx.Observable<ResultData<List<GithubRepoEntity>>> listRepos(@Path("user") String user,
+                                        @Query("q") String q);
 
 }

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

@@ -8,13 +8,12 @@
 
 import com.im4j.kakacache.rxjava.common.utils.LogUtils;
 import com.im4j.kakacache.rxjava.netcache.KakaCache;
-import com.im4j.kakacache.rxjava.netcache.KakaRetrofit;
+import com.im4j.kakacache.rxjava.netcache.retrofit.KakaRxCallAdapterFactory;
 import com.im4j.kakacache.rxjava.netcache.strategy.CacheAndRemoteStrategy;
-import com.im4j.kakacache.rxjava.netcache.strategy.FirstCacheStrategy;
 
 import java.util.concurrent.TimeUnit;
 
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 import rx.Observable;
 import rx.Subscriber;
@@ -48,14 +47,25 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         btnTestRetrofit = (Button) findViewById(R.id.btn_test_retrofit);
         btnTestRetrofit.setOnClickListener(view -> {
-            KakaRetrofit retrofit = new KakaRetrofit.Builder()
+            Retrofit retrofit = new Retrofit.Builder()
                     .baseUrl("https://api.github.com/")
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                    .addConverterFactory(GsonConverterFactory.create(KakaCache.gson().create()))
+                    .addCallAdapterFactory(KakaRxCallAdapterFactory.create())
                     .build();
 
             GitHubService service = retrofit.create(GitHubService.class);
-            service.listRepos("octocat").compose(KakaCache.transformer(KEY_CACHE, new FirstCacheStrategy())).subscribeOn(Schedulers.io()).subscribe(data -> {
+
+//            // 不修改原有代码，增加对Cache的支持
+//            service.listRepos("octocat").compose(KakaCache.transformer(KEY_CACHE, new FirstCacheStrategy())).subscribeOn(Schedulers.io()).subscribe(data -> {
+//                LogUtils.e(data);
+//            }, error -> {
+//                LogUtils.e(error);
+//            });
+
+            // 通过注解，自动支持Cache
+            service.listRepos("octocat", "abc")
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(data -> {
                 LogUtils.e(data);
             }, error -> {
                 LogUtils.e(error);

library/build.gradle

@@ -30,4 +30,6 @@ dependencies {
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.squareup.okhttp3:okhttp:3.3.1'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    compile 'com.google.code.gson:gson:2.7'
 }

library/src/main/java/com/im4j/kakacache/rxjava/common/utils/LogUtils.java

@@ -2,13 +2,11 @@
 
 import android.util.Log;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 
 /**
+ * 日志打印工具
  * @version alafighting 2016-07
  */
 public final class LogUtils {
@@ -22,7 +20,7 @@ public static void e(Object obj) {
         String tag = className+'.'+element.getMethodName()+'('+element.getFileName()+':'+element.getLineNumber()+')';
         String message = toString(obj);
 
-        Log.e("[KakaCache]", tag+"\t"+message);
+        Log.e("[KakaCache]", tag+"\n\t"+message);
     }
 
     private static String toString(Object obj) {