feat: add support for custom objectId

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

@@ -52,6 +52,7 @@ public class Parse {
     private static final Object MUTEX_CALLBACKS = new Object();
     static ParseEventuallyQueue eventuallyQueue = null;
     private static boolean isLocalDatastoreEnabled;
+    private static boolean allowCustomObjectId = false;
 
     //endregion
     private static OfflineStore offlineStore;
@@ -106,6 +107,8 @@ public static boolean isLocalDatastoreEnabled() {
         return isLocalDatastoreEnabled;
     }
 
+    public static boolean isAllowCustomObjectId() { return allowCustomObjectId; }
+
     /**
      * Authenticates this client as belonging to your application.
      * This must be called before your
@@ -135,6 +138,8 @@ static void initialize(Configuration configuration, ParsePlugins parsePlugins) {
         // isLocalDataStoreEnabled() to perform additional behavior.
         isLocalDatastoreEnabled = configuration.localDataStoreEnabled;
 
+        allowCustomObjectId = configuration.allowCustomObjectId;
+
         if (parsePlugins == null) {
             ParsePlugins.initialize(configuration.context, configuration);
         } else {
@@ -564,6 +569,7 @@ public static final class Configuration {
         final String clientKey;
         final String server;
         final boolean localDataStoreEnabled;
+        final boolean allowCustomObjectId;
         final OkHttpClient.Builder clientBuilder;
         final int maxRetries;
         private Configuration(Builder builder) {
@@ -572,6 +578,7 @@ private Configuration(Builder builder) {
             this.clientKey = builder.clientKey;
             this.server = builder.server;
             this.localDataStoreEnabled = builder.localDataStoreEnabled;
+            this.allowCustomObjectId = builder.allowCustomObjectId;
             this.clientBuilder = builder.clientBuilder;
             this.maxRetries = builder.maxRetries;
         }
@@ -585,6 +592,7 @@ public static final class Builder {
             private String clientKey;
             private String server;
             private boolean localDataStoreEnabled;
+            private boolean allowCustomObjectId;
             private OkHttpClient.Builder clientBuilder;
             private int maxRetries = DEFAULT_MAX_RETRIES;
 
@@ -649,6 +657,16 @@ private Builder setLocalDatastoreEnabled(boolean enabled) {
                 return this;
             }
 
+            public Builder allowCustomObjectId() {
+                allowCustomObjectId = true;
+                return this;
+            }
+
+            private Builder setAllowCustomObjectId(boolean enabled) {
+                allowCustomObjectId = enabled;
+                return this;
+            }
+
             /**
              * Set the {@link okhttp3.OkHttpClient.Builder} to use when communicating with the Parse
              * REST API

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

@@ -2253,6 +2253,10 @@ Task<Void> saveAsync(final String sessionToken, final Task<Void> toAwait) {
             return Task.forResult(null);
         }
 
+        if(Parse.isAllowCustomObjectId() && getObjectId() == null){
+            return Task.forError(new ParseException(104, "ObjectId must not be null"));
+        }
+
         final ParseOperationSet operations;
         synchronized (mutex) {
             updateBeforeSave();
@@ -2365,6 +2369,10 @@ public final Task<Void> saveEventually() {
             return Task.forResult(null);
         }
 
+        if(Parse.isAllowCustomObjectId() && getObjectId() == null){
+            return Task.forError(new ParseException(104, "ObjectId must not be null"));
+        }
+
         final ParseOperationSet operationSet;
         final ParseRESTCommand command;
         final Task<JSONObject> runEventuallyTask;

parse/src/main/java/com/parse/ParseRESTObjectCommand.java

@@ -38,11 +38,26 @@ public static ParseRESTObjectCommand saveObjectCommand(
                     operations,
                     sessionToken);
         } else {
-            return ParseRESTObjectCommand.updateObjectCommand(
-                    state.objectId(),
-                    state.className(),
-                    operations,
-                    sessionToken);
+            if(Parse.isAllowCustomObjectId()){
+                if(state.createdAt() == -1){
+                    return ParseRESTObjectCommand.createObjectCommand(
+                            state.className(),
+                            operations,
+                            sessionToken);
+                }else{
+                    return ParseRESTObjectCommand.updateObjectCommand(
+                            state.objectId(),
+                            state.className(),
+                            operations,
+                            sessionToken);
+                }
+            }else{
+                return ParseRESTObjectCommand.updateObjectCommand(
+                        state.objectId(),
+                        state.className(),
+                        operations,
+                        sessionToken);
+            }
         }
     }
 

parse/src/test/java/com/parse/ParseClientConfigurationTest.java

@@ -26,12 +26,14 @@ public void testBuilder() {
         builder.applicationId("foo");
         builder.clientKey("bar");
         builder.enableLocalDataStore();
+        builder.allowCustomObjectId();
         Parse.Configuration configuration = builder.build();
 
         assertNull(configuration.context);
         assertEquals(configuration.applicationId, "foo");
         assertEquals(configuration.clientKey, "bar");
         assertEquals(configuration.localDataStoreEnabled, true);
+        assertEquals(configuration.allowCustomObjectId, true);
     }
 
     @Test

parse/src/test/java/com/parse/ParseObjectTest.java

@@ -37,10 +37,13 @@
 import com.parse.boltsinternal.Task;
 import com.parse.boltsinternal.TaskCompletionSource;
 
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
@@ -160,6 +163,109 @@ public void testFromJsonWithLdsStackOverflow() throws JSONException {
 
     //endregion
 
+    @Test
+    public void testSaveCustomObjectIdMissing(){
+        // Mocked to let save work
+        mockCurrentUserController();
+
+        Parse.Configuration configuration =
+                new Parse.Configuration.Builder(RuntimeEnvironment.application)
+                        .applicationId(BuildConfig.APPLICATION_ID)
+                        .server("https://api.parse.com/1")
+                        .allowCustomObjectId()
+                        .build();
+
+        ParsePlugins plugins = ParseTestUtils.mockParsePlugins(configuration);
+        Parse.initialize(configuration, plugins);
+
+        ParseObject object = new ParseObject("TestObject");
+        try {
+            object.save();
+        } catch (ParseException e) {
+            assertEquals(e.getCode(), 104);
+            assertThat(e.getMessage(), is("ObjectId must not be null"));
+        }
+    }
+
+    @Test
+    public void testSaveCustomObjectIdNotMissing() throws ParseException{
+        // Mocked to let save work
+        mockCurrentUserController();
+
+        Parse.Configuration configuration =
+                new Parse.Configuration.Builder(RuntimeEnvironment.application)
+                        .applicationId(BuildConfig.APPLICATION_ID)
+                        .server("https://api.parse.com/1")
+                        .allowCustomObjectId()
+                        .build();
+
+        ParsePlugins plugins = ParseTestUtils.mockParsePlugins(configuration);
+        Parse.initialize(configuration, plugins);
+
+        ParseObject object = new ParseObject("TestObject");
+        object.setObjectId("ABCDEF123456");
+        object.save();
+    }
+
+    @Test
+    public void testSaveEventuallyCustomObjectIdMissing(){
+        // Mocked to let save work
+        mockCurrentUserController();
+
+        Parse.Configuration configuration =
+                new Parse.Configuration.Builder(RuntimeEnvironment.application)
+                        .applicationId(BuildConfig.APPLICATION_ID)
+                        .server("https://api.parse.com/1")
+                        .enableLocalDataStore()
+                        .allowCustomObjectId()
+                        .build();
+
+        ParsePlugins plugins = ParseTestUtils.mockParsePlugins(configuration);
+        Parse.initialize(configuration, plugins);
+
+        OfflineStore lds = mock(OfflineStore.class);
+        Parse.setLocalDatastore(lds);
+
+        ParseObject object = new ParseObject("TestObject");
+        object.saveEventually(new SaveCallback() {
+            @Override
+            public void done(ParseException e) {
+                assertNotNull(e);
+                assertEquals(e.getCode(), 104);
+                assertThat(e.getMessage(), is("ObjectId must not be null"));
+            }
+        });
+    }
+
+    @Test
+    public void testSaveEventuallyCustomObjectIdNotMissing() throws ParseException{
+        // Mocked to let save work
+        mockCurrentUserController();
+
+        Parse.Configuration configuration =
+                new Parse.Configuration.Builder(RuntimeEnvironment.application)
+                        .applicationId(BuildConfig.APPLICATION_ID)
+                        .server("https://api.parse.com/1")
+                        .enableLocalDataStore()
+                        .allowCustomObjectId()
+                        .build();
+
+        ParsePlugins plugins = ParseTestUtils.mockParsePlugins(configuration);
+        Parse.initialize(configuration, plugins);
+
+        OfflineStore lds = mock(OfflineStore.class);
+        Parse.setLocalDatastore(lds);
+
+        ParseObject object = new ParseObject("TestObject");
+        object.setObjectId("ABCDEF123456");
+        object.saveEventually(new SaveCallback() {
+            @Override
+            public void done(ParseException e) {
+                assertNull(e);
+            }
+        });
+    }
+
     //region testGetter
 
     @Test