替换Source\Sink为InputStream\OutputStream；去除Storage的snapshot()方法

Author: alafighting

library/src/main/java/com/im4j/kakacache/rxjava/core/CacheCore.java

@@ -60,6 +60,9 @@ public <T> void save(String key, T value, int expires, CacheTarget target) throw
         }
 
         if (memory != null) {
+            // TODO value = value.clone() 避免内存存储对象引用？
+            // TODO clone拷贝造成双倍内存开销？
+            // TODO 被缓存的对象，一般不做修改，只做读取
             memory.save(key, value, expires, target);
         }
         if (disk != null) {

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/DiskCache.java

@@ -8,10 +8,10 @@
 import com.im4j.kakacache.rxjava.core.CacheTarget;
 import com.im4j.kakacache.rxjava.core.disk.converter.IDiskConverter;
 import com.im4j.kakacache.rxjava.core.disk.journal.IDiskJournal;
-import com.im4j.kakacache.rxjava.core.disk.sink.Sink;
-import com.im4j.kakacache.rxjava.core.disk.source.Source;
 import com.im4j.kakacache.rxjava.core.disk.storage.IDiskStorage;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 
 /**
@@ -46,7 +46,7 @@ public DiskCache(IDiskStorage storage,
     @Override
     protected <T> T doLoad(String key) throws CacheException {
         // 读取缓存
-        Source source = mStorage.load(key);
+        InputStream source = mStorage.load(key);
         T value = null;
         if (source != null) {
             value = (T) mConverter.load(source, new TypeToken<T>(){}.getType());
@@ -66,7 +66,7 @@ protected <T> void doSave(String key, T value, int maxAge, CacheTarget target) t
         }
 
         // 写入缓存
-        Sink sink = mStorage.create(key);
+        OutputStream sink = mStorage.create(key);
         if (sink != null) {
             mConverter.writer(sink, value);
             Utils.close(sink);

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/GsonDiskConverter.java

@@ -5,11 +5,11 @@
 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.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 
 /**
@@ -24,23 +24,22 @@ public GsonDiskConverter(Gson gson) {
     }
 
     @Override
-    public Object load(Source source, Type type) {
+    public Object load(InputStream source, Type type) {
         Object value = null;
-        ReaderSource readerSource = new ReaderSource(source);
         try {
-            value = gson.fromJson(readerSource, type);
+            value = gson.fromJson(new InputStreamReader(source), type);
         } catch (JsonIOException e) {
             LogUtils.log(e);
         } catch (JsonSyntaxException e) {
             LogUtils.log(e);
         } finally {
-            Utils.close(readerSource);
+            Utils.close(source);
         }
         return value;
     }
 
     @Override
-    public void writer(Sink sink, Object data) {
+    public void writer(OutputStream sink, Object data) {
         try {
             String json = gson.toJson(data);
             byte[] bytes = json.getBytes();

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/IDiskConverter.java

@@ -1,8 +1,7 @@
 package com.im4j.kakacache.rxjava.core.disk.converter;
 
-import com.im4j.kakacache.rxjava.core.disk.sink.Sink;
-import com.im4j.kakacache.rxjava.core.disk.source.Source;
-
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 
 /**
@@ -18,7 +17,7 @@ public interface IDiskConverter {
      * @param source
      * @return
      */
-    Object load(Source source, Type type);
+    Object load(InputStream source, Type type);
 
     /**
      * 写入
@@ -27,6 +26,6 @@ public interface IDiskConverter {
      * @param data
      * @return
      */
-    void writer(Sink sink, Object data);
+    void writer(OutputStream sink, Object data);
 
 }

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/KryoDiskConverter.java

@@ -4,11 +4,9 @@
 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.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 
 /**
@@ -23,11 +21,11 @@ public KryoDiskConverter(Kryo kryo) {
     }
 
     @Override
-    public Object load(Source source, Type type) {
+    public Object load(InputStream source, Type type) {
         Object value = null;
         Input input = null;
         try {
-            input = new Input(new BasicSource(source));
+            input = new Input(source);
             value = kryo.readClassAndObject(input);
         } finally {
             Utils.close(input);
@@ -36,10 +34,10 @@ public Object load(Source source, Type type) {
     }
 
     @Override
-    public void writer(Sink sink, Object data) {
+    public void writer(OutputStream sink, Object data) {
         Output output = null;
         try {
-            output = new Output(new BasicSink(sink));
+            output = new Output(sink);
             kryo.writeClassAndObject(output, data);
         } finally {
             Utils.close(output);

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/converter/SerializableDiskConverter.java

@@ -2,28 +2,26 @@
 
 import com.im4j.kakacache.rxjava.common.utils.LogUtils;
 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.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Type;
 
 /**
  * 序列化-数据转换器
- * @version alafighting 2016-06
+ * @version alafighting 2016-07
  */
 public class SerializableDiskConverter implements IDiskConverter {
 
     @Override
-    public Object load(Source source, Type type) {
+    public Object load(InputStream source, Type type) {
         Object value = null;
         ObjectInputStream oin = null;
         try {
-            oin = new ObjectInputStream(new BasicSource(source));
+            oin = new ObjectInputStream(source);
             value = oin.readObject();
         } catch (IOException e) {
             LogUtils.log(e);
@@ -36,10 +34,10 @@ public Object load(Source source, Type type) {
     }
 
     @Override
-    public void writer(Sink sink, Object data) {
+    public void writer(OutputStream sink, Object data) {
         ObjectOutputStream oos = null;
         try {
-            oos = new ObjectOutputStream(new BasicSink(sink));
+            oos = new ObjectOutputStream(sink);
             oos.writeObject(data);
             oos.flush(); //缓冲流
         } catch (IOException e) {

library/src/main/java/com/im4j/kakacache/rxjava/core/disk/journal/BasicDiskJournal.java

@@ -47,7 +47,7 @@ public CacheEntry get(String key) {
     }
 
     @Override
-    public final void put(String key, CacheEntry entry) {
+    public void put(String key, CacheEntry entry) {
         if (Utils.isEmpty(key) || entry == null) {
             throw new NullException("key == null || value == null");
         }