Revise constructor and unhold file pointer

Author: wangmengyan95

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

@@ -140,52 +140,14 @@ public String url() {
   private Set<Task<?>.TaskCompletionSource> currentTasks = Collections.synchronizedSet(
       new HashSet<Task<?>.TaskCompletionSource>());
 
-  /**
-   * Creates a new file from a file pointer, file name, and content type. Content type will be used
-   * instead of auto-detection by file extension.
-   *
-   * @param name
-   *          The file's name, ideally with extension. The file name must begin with an alphanumeric
-   *          character, and consist of alphanumeric characters, periods, spaces, underscores, or
-   *          dashes.
-   * @param file
-   *          The file.
-   * @param contentType
-   *          The file's content type.
-   */
-  public ParseFile(String name, File file, String contentType) {
-    this(new State.Builder().name(name).mimeType(contentType).build());
-    if (file.length() > MAX_FILE_SIZE) {
-      throw new IllegalArgumentException(String.format("ParseFile must be less than %d bytes",
-          MAX_FILE_SIZE));
-    }
-    this.file = file;
-  }
-
   /**
    * Creates a new file from a file pointer.
    *
    * @param file
    *          The file.
    */
   public ParseFile(File file) {
-    this(null, file, null);
-  }
-
-  /**
-   * Creates a new file from a file pointer and a name. Giving a name with a proper file extension
-   * (e.g. ".png") is ideal because it allows Parse to deduce the content type of the file and set
-   * appropriate HTTP headers when it is fetched.
-   *
-   * @param name
-   *          The file's name, ideally with extension. The file name must begin with an alphanumeric
-   *          character, and consist of alphanumeric characters, periods, spaces, underscores, or
-   *          dashes.
-   * @param file
-   *          The file.
-   */
-  public ParseFile(String name, File file) {
-    this(name, file, null);
+    this(file, null);
   }
 
   /**
@@ -198,7 +160,12 @@ public ParseFile(String name, File file) {
    *          The file's content type.
    */
   public ParseFile(File file, String contentType) {
-    this(null, file, contentType);
+    this(new State.Builder().name(file.getName()).mimeType(contentType).build());
+    if (file.length() > MAX_FILE_SIZE) {
+      throw new IllegalArgumentException(String.format("ParseFile must be less than %d bytes",
+          MAX_FILE_SIZE));
+    }
+    this.file = file;
   }
 
   /**
@@ -335,24 +302,30 @@ public Task<Void> then(Task<Void> task) throws Exception {
           return Task.cancelled();
         }
 
-        Task<ParseFile.State> saveTask = data != null ?
-            getFileController().saveAsync(
-                state,
-                data,
-                sessionToken,
-                progressCallbackOnMainThread(uploadProgressCallback),
-                cancellationToken) :
-            getFileController().saveAsync(
-                state,
-                file,
-                sessionToken,
-                progressCallbackOnMainThread(uploadProgressCallback),
-                cancellationToken);
+        Task<ParseFile.State> saveTask;
+        if (data != null) {
+          saveTask = getFileController().saveAsync(
+              state,
+              data,
+              sessionToken,
+              progressCallbackOnMainThread(uploadProgressCallback),
+              cancellationToken);
+        } else {
+          saveTask = getFileController().saveAsync(
+              state,
+              file,
+              sessionToken,
+              progressCallbackOnMainThread(uploadProgressCallback),
+              cancellationToken);
+        }
 
         return saveTask.onSuccessTask(new Continuation<State, Task<Void>>() {
           @Override
           public Task<Void> then(Task<State> task) throws Exception {
             state = task.getResult();
+            // Since we have successfully uploaded the file, we do not need to hold the file pointer
+            // anymore.
+            file = null;
             return task.makeVoid();
           }
         });

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

@@ -54,7 +54,7 @@ public void testConstructor() throws Exception {
     String name = "name";
     byte[] data = "hello".getBytes();
     String contentType = "content_type";
-    File file = temporaryFolder.newFile("test");
+    File file = temporaryFolder.newFile(name);
 
     ParseFile parseFile = new ParseFile(name, data, contentType);
     assertEquals("name", parseFile.getName());
@@ -81,23 +81,13 @@ public void testConstructor() throws Exception {
     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());
-    assertTrue(parseFile.isDirty());
-
     parseFile = new ParseFile(file);
-    assertEquals("file", parseFile.getName()); // Default
-    assertEquals(null, parseFile.getState().mimeType());
-    assertTrue(parseFile.isDirty());
-
-    parseFile = new ParseFile(name, file);
-    assertEquals("name", parseFile.getName());
+    assertEquals(name, parseFile.getName()); // Default
     assertEquals(null, parseFile.getState().mimeType());
     assertTrue(parseFile.isDirty());
 
     parseFile = new ParseFile(file, contentType);
-    assertEquals("file", parseFile.getName()); // Default
+    assertEquals(name, parseFile.getName()); // Default
     assertEquals("content_type", parseFile.getState().mimeType());
   }
 
@@ -223,7 +213,7 @@ public void testSaveAsyncSuccessWithData() throws Exception {
   @Test
   public void testSaveAsyncSuccessWithFile() throws Exception {
     String name = "name";
-    File file = temporaryFolder.newFile("test");
+    File file = temporaryFolder.newFile(name);
     String contentType = "content_type";
     String url = "url";
     ParseFile.State state = new ParseFile.State.Builder()
@@ -238,7 +228,7 @@ public void testSaveAsyncSuccessWithFile() throws Exception {
         Matchers.<Task<Void>>any())).thenReturn(Task.forResult(state));
     ParseCorePlugins.getInstance().registerFileController(controller);
 
-    ParseFile parseFile = new ParseFile(name, file, contentType);
+    ParseFile parseFile = new ParseFile(file, contentType);
     ParseTaskUtils.wait(parseFile.saveAsync(null, null, null));
 
     // Verify controller get the correct data