Remvoe ParseFile in-memory cache

Author: wangmengyan95

Parse/src/main/java/com/parse/ParseFile.java

@@ -295,6 +295,7 @@ public boolean isDirty() {
    * Whether the file has available data.
    */
   public boolean isDataAvailable() {
+    // TODO(mengyan): Revise when we have proper stage strategy for file pointer
     return data != null || getFileController().isDataAvailable(state);
   }
 
@@ -389,6 +390,9 @@ public Task<Void> then(Task<String> task) throws Exception {
       public Task<Void> then(Task<Void> task) throws Exception {
         cts.trySetResult(null); // release
         currentTasks.remove(cts);
+        // Clear in memory file pointer and data
+        data = null;
+        file = null;
         return task;
       }
     });
@@ -453,30 +457,18 @@ public byte[] getData() throws ParseException {
    * @return A Task that is resolved when the data has been fetched.
    */
   public Task<byte[]> getDataInBackground(final ProgressCallback progressCallback) {
-    // If data is already available, just return immediately.
-    if (data != null) {
-      // in-memory
-      return Task.forResult(data);
-    }
-
     final Task<Void>.TaskCompletionSource cts = Task.create();
     currentTasks.add(cts);
 
     return taskQueue.enqueue(new Continuation<Void, Task<byte[]>>() {
       @Override
       public Task<byte[]> then(Task<Void> toAwait) throws Exception {
-        // If data is already available, just return immediately.
-        if (data != null) {
-          // in-memory
-          return Task.forResult(data);
-        }
-
         return fetchInBackground(progressCallback, toAwait, cts.getTask()).onSuccess(new Continuation<File, byte[]>() {
           @Override
           public byte[] then(Task<File> task) throws Exception {
             File file = task.getResult();
             try {
-              data =  ParseFileUtils.readFileToByteArray(file);
+              byte[] data =  ParseFileUtils.readFileToByteArray(file);
               return data;
             } catch (IOException e) {
               // do nothing

Parse/src/test/java/com/parse/ParseFileTest.java

@@ -58,31 +58,28 @@ public void testConstructor() throws Exception {
     String contentType = "content_type";
     File file = temporaryFolder.newFile("test");
 
+    // TODO(mengyan): Test data and file pointer in ParseFile when we have proper stage strategy
+
     ParseFile parseFile = new ParseFile(name, data, contentType);
     assertEquals("name", parseFile.getName());
-    assertEquals("hello", new String(parseFile.getData()));
     assertEquals("content_type", parseFile.getState().mimeType());
     assertTrue(parseFile.isDirty());
 
     parseFile = new ParseFile(data);
     assertEquals("file", parseFile.getName()); // Default
-    assertEquals("hello", new String(parseFile.getData()));
     assertEquals(null, parseFile.getState().mimeType());
     assertTrue(parseFile.isDirty());
 
     parseFile = new ParseFile(name, data);
     assertEquals("name", parseFile.getName());
-    assertEquals("hello", new String(parseFile.getData()));
     assertEquals(null, parseFile.getState().mimeType());
     assertTrue(parseFile.isDirty());
 
     parseFile = new ParseFile(data, contentType);
     assertEquals("file", parseFile.getName()); // Default
-    assertEquals("hello", new String(parseFile.getData()));
     assertEquals("content_type", parseFile.getState().mimeType());
     assertTrue(parseFile.isDirty());
 
-    // TODO(mengyan): Test file pointer in ParseFile when we have proper stage strategy
     parseFile = new ParseFile(name, file, contentType);
     assertEquals("name", parseFile.getName());
     assertEquals("content_type", parseFile.getState().mimeType());