增加更多的DiskConverter实现

alafighting · alafighting · commit 0da806d427ed · 2016-07-09T14:58:57.000+08:00
diff --git a/app/src/main/java/com/im4j/kakacache/rxjava/demo/GithubRepoEntity.java b/app/src/main/java/com/im4j/kakacache/rxjava/demo/GithubRepoEntity.java
@@ -2,12 +2,10 @@
 
 import com.im4j.kakacache.rxjava.common.utils.MemorySizeOf;
 
-import java.io.Serializable;
-
 /**
  * @version alafighting 2016-07
  */
-public class GithubRepoEntity implements MemorySizeOf.SizeOf, Serializable {
+public class GithubRepoEntity implements MemorySizeOf.SizeOf {
 
     private String id;
     private String name;
diff --git a/library/build.gradle b/library/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
+    compile 'com.esotericsoftware:kryo:4.0.0'
 }
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/KakaCache.java b/library/src/main/java/com/im4j/kakacache/rxjava/KakaCache.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import com.esotericsoftware.kryo.Kryo;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -12,6 +13,7 @@
 import com.im4j.kakacache.rxjava.common.utils.LogUtils;
 import com.im4j.kakacache.rxjava.common.utils.Utils;
 import com.im4j.kakacache.rxjava.core.CacheCore;
+import com.im4j.kakacache.rxjava.core.disk.converter.KryoDiskConverter;
 import com.im4j.kakacache.rxjava.core.disk.converter.SerializableDiskConverter;
 import com.im4j.kakacache.rxjava.core.disk.journal.LRUDiskJournal;
 import com.im4j.kakacache.rxjava.core.disk.storage.FileDiskStorage;
@@ -74,7 +76,7 @@ public static RxCacheManager manager() {
             coreBuilder.disk(new FileDiskStorage(storageDir));
             coreBuilder.diskJournal(new LRUDiskJournal(liteOrm));
             coreBuilder.diskMax(30 * 1024 * 1024, 10 * 1000);
-            coreBuilder.diskConverter(new SerializableDiskConverter());
+            coreBuilder.diskConverter(new KryoDiskConverter(new Kryo()));
             CacheCore core = coreBuilder.create();
             cacheManager = new RxCacheManager(core, DEFAULT_EXPIRES);
         }
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/common/utils/Utils.java b/library/src/main/java/com/im4j/kakacache/rxjava/common/utils/Utils.java
@@ -39,15 +39,6 @@ public static <T> T checkNotNull(T obj) {
         }
         return obj;
     }
-    /**
-     * 不为空
-     */
-    public static <T> T checkNotNull(T obj, String message) {
-        if (obj == null) {
-            throw new NullException(message);
-        }
-        return obj;
-    }
 
     /**
      * 不小于0
@@ -61,10 +52,7 @@ public static long checkNotLessThanZero(long number) {
     }
 
     public static boolean isEmpty(String str) {
-        if (str == null || str.isEmpty()) {
-            return true;
-        }
-        return false;
+        return str == null || str.isEmpty();
     }
 
 
@@ -226,15 +214,6 @@ public static File getStorageCacheDir(Context context) {
                 + context.getPackageName() + SEPARATOR + "cache" + SEPARATOR);
     }
     static File getDataCacheDir(Context context) {
-//        String dataDir = "/data";
-//
-//        File path = Environment.getDataDirectory();
-//        if (path != null) {
-//            dataDir = path.getAbsolutePath();
-//        }
-//        return new File(dataDir + SEPARATOR + "data"  + SEPARATOR
-//                + context.getPackageName() + SEPARATOR + "cache" + SEPARATOR);
-
         return context.getCacheDir();
     }
 
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/GsonDiskConverter.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/GsonDiskConverter.java
@@ -0,0 +1,58 @@
+package com.im4j.kakacache.rxjava.core.disk.converter;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
+import com.im4j.kakacache.rxjava.common.utils.LogUtils;
+import com.im4j.kakacache.rxjava.common.utils.Utils;
+import com.im4j.kakacache.rxjava.core.disk.sink.Sink;
+import com.im4j.kakacache.rxjava.core.disk.source.ReaderSource;
+import com.im4j.kakacache.rxjava.core.disk.source.Source;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+/**
+ * GSON-数据转换器
+ * @version alafighting 2016-07
+ */
+public class GsonDiskConverter implements IDiskConverter {
+    private Gson gson;
+
+    public GsonDiskConverter(Gson gson) {
+        this.gson = gson;
+    }
+
+    @Override
+    public Object load(Source source, Type type) {
+        Object value = null;
+        ReaderSource readerSource = new ReaderSource(source);
+        try {
+            value = gson.fromJson(readerSource, type);
+        } catch (JsonIOException e) {
+            LogUtils.log(e);
+        } catch (JsonSyntaxException e) {
+            LogUtils.log(e);
+        } finally {
+            Utils.close(readerSource);
+        }
+        return value;
+    }
+
+    @Override
+    public void writer(Sink sink, Object data) {
+        try {
+            String json = gson.toJson(data);
+            byte[] bytes = json.getBytes();
+            sink.write(bytes, 0, bytes.length);
+            sink.flush();
+        } catch (JsonIOException e) {
+            LogUtils.log(e);
+        } catch (JsonSyntaxException e) {
+            LogUtils.log(e);
+        } catch (IOException e) {
+            LogUtils.log(e);
+        }
+    }
+
+}
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/KryoDiskConverter.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/KryoDiskConverter.java
@@ -0,0 +1,49 @@
+package com.im4j.kakacache.rxjava.core.disk.converter;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import com.im4j.kakacache.rxjava.common.utils.Utils;
+import com.im4j.kakacache.rxjava.core.disk.sink.BasicSink;
+import com.im4j.kakacache.rxjava.core.disk.sink.Sink;
+import com.im4j.kakacache.rxjava.core.disk.source.BasicSource;
+import com.im4j.kakacache.rxjava.core.disk.source.Source;
+
+import java.lang.reflect.Type;
+
+/**
+ * Kryo-数据转换器
+ * @version alafighting 2016-07
+ */
+public class KryoDiskConverter implements IDiskConverter {
+    private Kryo kryo;
+
+    public KryoDiskConverter(Kryo kryo) {
+        this.kryo = kryo;
+    }
+
+    @Override
+    public Object load(Source source, Type type) {
+        Object value = null;
+        Input input = null;
+        try {
+            input = new Input(new BasicSource(source));
+            value = kryo.readClassAndObject(input);
+        } finally {
+            Utils.close(input);
+        }
+        return value;
+    }
+
+    @Override
+    public void writer(Sink sink, Object data) {
+        Output output = null;
+        try {
+            output = new Output(new BasicSink(sink));
+            kryo.writeClassAndObject(output, data);
+        } finally {
+            Utils.close(output);
+        }
+    }
+
+}
diff --git a/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/source/ReaderSource.java b/library/src/main/java/com/im4j/kakacache/rxjava/core/disk/source/ReaderSource.java
@@ -0,0 +1,22 @@
+package com.im4j.kakacache.rxjava.core.disk.source;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * @version alafighting 2016-07
+ */
+public class ReaderSource extends InputStreamReader implements Source {
+
+    private final Source source;
+
+    public ReaderSource(Source source) {
+        super(new BasicSource(source));
+        this.source = source;
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int byteCount) throws IOException {
+        return source.read(buffer, offset, byteCount);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ dependencies {`
`33`	`33`	`compile 'com.squareup.retrofit2:retrofit:2.1.0'`
`34`	`34`	`compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'`
`35`	`35`	`compile 'com.squareup.retrofit2:converter-gson:2.1.0'`
	`36`	`+ compile 'com.esotericsoftware:kryo:4.0.0'`
`36`	`37`	`}`