Add new ParseACL(acl) for copying

Author: grantland

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

@@ -103,32 +103,41 @@ public static void setDefaultACL(ParseACL acl, boolean withAccessForCurrentUser)
     return getDefaultACLController().get();
   }
 
+  // State
+  private final Map<String, Permissions> permissionsById = new HashMap<>();
   private boolean shared;
+
   /**
    * A lazy user that hasn't been saved to Parse.
    */
   //TODO (grantland): This should be a list for multiple lazy users with read/write permissions.
   private ParseUser unresolvedUser;
 
-  private Map<String, Permissions> permissionsById;
-
   /**
    * Creates an ACL with no permissions granted.
    */
   public ParseACL() {
-    permissionsById = new HashMap<>();
+    // do nothing
   }
 
-  /* package */ ParseACL copy() {
-    ParseACL copy = new ParseACL();
-    for (String id : permissionsById.keySet()) {
-      copy.permissionsById.put(id, new Permissions(permissionsById.get(id)));
+  /**
+   * Creates a copy of {@code acl}.
+   *
+   * @param acl
+   *          The acl to copy.
+   */
+  public ParseACL(ParseACL acl) {
+    for (String id : acl.permissionsById.keySet()) {
+      permissionsById.put(id, new Permissions(acl.permissionsById.get(id)));
     }
-    copy.unresolvedUser = unresolvedUser;
+    unresolvedUser = acl.unresolvedUser;
     if (unresolvedUser != null) {
-      unresolvedUser.registerSaveListener(new UserResolutionListener(copy));
+      unresolvedUser.registerSaveListener(new UserResolutionListener(this));
     }
-    return copy;
+  }
+
+  /* package for tests */ ParseACL copy() {
+    return new ParseACL(this);
   }
 
   boolean isShared() {

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

@@ -3397,7 +3397,7 @@ private ParseACL getACL(boolean mayCopy) {
         throw new RuntimeException("only ACLs can be stored in the ACL key");
       }
       if (mayCopy && ((ParseACL) acl).isShared()) {
-        ParseACL copy = ((ParseACL) acl).copy();
+        ParseACL copy = new ParseACL((ParseACL) acl);
         estimatedData.put(KEY_ACL, copy);
         return copy;
       }

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

@@ -55,6 +55,31 @@ private static void checkArgument(boolean expression, Object errorMessage) {
       private Boolean pushToAndroid;
       private JSONObject data;
 
+      public Builder() {
+        // do nothing
+      }
+
+      private Builder(State state) {
+        this.channelSet = state.channelSet == null
+            ? null
+            : Collections.unmodifiableSet(new HashSet<>(state.channelSet));
+        this.query = state.queryState == null
+            ? null
+            : new ParseQuery<>(new ParseQuery.State.Builder<ParseInstallation>(state.queryState));
+        this.expirationTime = state.expirationTime;
+        this.expirationTimeInterval = state.expirationTimeInterval;
+        this.pushToIOS = state.pushToIOS;
+        this.pushToAndroid = state.pushToAndroid;
+        // Since in state.build() we check data is not null, we do not need to check it again here.
+        JSONObject copyData = null;
+        try {
+          copyData = new JSONObject(state.data.toString());
+        } catch (JSONException e) {
+          // Swallow this silently since it is impossible to happen
+        }
+        this.data = copyData;
+      }
+
       public Builder expirationTime(Long expirationTime) {
         this.expirationTime = expirationTime;
         expirationTimeInterval = null;
@@ -184,15 +209,27 @@ public JSONObject data() {
   /* package for test */ final State.Builder builder;
 
   /**
-   * Creates a new push notification. The default channel is the empty string, also known as the
-   * global broadcast channel, but this value can be overridden using {@link #setChannel(String)},
-   * {@link #setChannels(Collection)} or {@link #setQuery(ParseQuery)}. Before sending the push
-   * notification you must call either {@link #setMessage(String)} or {@link #setData(JSONObject)}.
+   * Creates a new push notification.
+   *
+   * The default channel is the empty string, also known as the global broadcast channel, but this
+   * value can be overridden using {@link #setChannel(String)}, {@link #setChannels(Collection)} or
+   * {@link #setQuery(ParseQuery)}. Before sending the push notification you must call either
+   * {@link #setMessage(String)} or {@link #setData(JSONObject)}.
    */
   public ParsePush() {
     this(new State.Builder());
   }
 
+  /**
+   * Creates a copy of {@code push}.
+   *
+   * @param push
+   *          The push to copy.
+   */
+  public ParsePush(ParsePush push) {
+    this(new State.Builder(push.builder.build()));
+  }
+
   private ParsePush(State.Builder builder) {
     this.builder = builder;
   }

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

@@ -88,7 +88,7 @@ public void testCopy() throws Exception {
     // setReadAccess()
     reset(unresolvedUser);
 
-    ParseACL copiedACL = acl.copy();
+    ParseACL copiedACL = new ParseACL(acl);
 
     assertEquals(1, copiedACL.getPermissionsById().size());
     assertTrue(copiedACL.getPermissionsById().containsKey(UNRESOLVED_KEY));
@@ -111,7 +111,7 @@ public void testCopyWithSaveListener() throws Exception {
     // setReadAccess()
     reset(unresolvedUser);
 
-    ParseACL copiedACL = acl.copy();
+    ParseACL copiedACL = new ParseACL(acl);
 
     // Make sure the callback is called
     ArgumentCaptor<GetCallback> callbackCaptor = ArgumentCaptor.forClass(GetCallback.class);