Merge pull request #330 from ParsePlatform/richardross.configuration.serverurl

richardjrossiii · richardjrossiii · commit 2dd0095f5674 · 2016-01-05T16:17:21.000-08:00
Add configurable serverURL to Parse.Configuration.
diff --git a/Parse/src/main/java/com/parse/Parse.java b/Parse/src/main/java/com/parse/Parse.java
@@ -22,6 +22,8 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,6 +50,7 @@ public static final class Builder {
       private Context context;
       private String applicationId;
       private String clientKey;
+      private String server = "https://api.parse.com/1";
       private boolean localDataStoreEnabled;
       private List<ParseNetworkInterceptor> interceptors;
 
@@ -128,6 +131,20 @@ public Builder clientKey(String clientKey) {
         return this;
       }
 
+      /**
+       * Set the server URL to be used by Parse.
+       *
+       * This method is only required if you intend to use a different API server than the one at
+       * api.parse.com.
+       *
+       * @param server The server URL to set.
+       * @return The same builder, for easy chaining.
+       */
+      public Builder server(String server) {
+        this.server = server;
+        return this;
+      }
+
       /**
        * Add a {@link ParseNetworkInterceptor}.
        *
@@ -182,13 +199,15 @@ public Configuration build() {
     /* package for tests */ final Context context;
     /* package for tests */ final String applicationId;
     /* package for tests */ final String clientKey;
+    /* package for tests */ final String server;
     /* package for tests */ final boolean localDataStoreEnabled;
     /* package for tests */ final List<ParseNetworkInterceptor> interceptors;
 
     private Configuration(Builder builder) {
       this.context = builder.context;
       this.applicationId = builder.applicationId;
       this.clientKey = builder.clientKey;
+      this.server = builder.server;
       this.localDataStoreEnabled = builder.localDataStoreEnabled;
       this.interceptors = builder.interceptors != null ?
         Collections.unmodifiableList(new ArrayList<>(builder.interceptors)) :
@@ -356,6 +375,13 @@ public static void initialize(Configuration configuration) {
     isLocalDatastoreEnabled = configuration.localDataStoreEnabled;
 
     ParsePlugins.Android.initialize(configuration.context, configuration.applicationId, configuration.clientKey);
+
+    try {
+      ParseRESTCommand.server = new URL(configuration.server);
+    } catch (MalformedURLException ex) {
+      throw new RuntimeException(ex);
+    }
+
     Context applicationContext = configuration.context.getApplicationContext();
 
     ParseHttpClient.setKeepAlive(true);
diff --git a/Parse/src/main/java/com/parse/ParseObject.java b/Parse/src/main/java/com/parse/ParseObject.java
@@ -49,7 +49,6 @@
  * existing data to retrieve.
  */
 public class ParseObject {
-  /* package */ static String server = "https://api.parse.com";
   private static final String AUTO_CLASS_NAME = "_Automatic";
   /* package */ static final String VERSION_NAME = "1.12.1-SNAPSHOT";
 
diff --git a/Parse/src/main/java/com/parse/ParseRESTCommand.java b/Parse/src/main/java/com/parse/ParseRESTCommand.java
@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -44,6 +46,9 @@
   private static final String HEADER_MASTER_KEY = "X-Parse-Master-Key";
   private static final String PARAMETER_METHOD_OVERRIDE = "_method";
 
+  // Set via Parse.initialize(Configuration)
+  /* package */ static URL server = null;
+
   private static LocalIdManager getLocalIdManager() {
     return ParseCorePlugins.getInstance().getLocalIdManager();
   }
@@ -189,7 +194,15 @@ public static ParseRESTCommand fromJSONObject(JSONObject jsonObject) {
   private static String createUrl(String httpPath) {
     // We send all parameters for GET/HEAD/DELETE requests in a post body,
     // so no need to worry about query parameters here.
-    return String.format("%s/1/%s", ParseObject.server, httpPath);
+    if (httpPath == null) {
+      return server.toString();
+    }
+
+    try {
+      return new URL(server, httpPath).toString();
+    } catch (MalformedURLException ex) {
+      throw new RuntimeException(ex);
+    }
   }
 
   protected void addAdditionalHeaders(ParseHttpRequest.Builder requestBuilder) {
diff --git a/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java b/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java
@@ -17,6 +17,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -63,7 +65,7 @@ public static List<Task<JSONObject>> executeBatch(
       for (ParseRESTObjectCommand command : commands) {
         JSONObject requestParameters = new JSONObject();
         requestParameters.put("method", command.method.toString());
-        requestParameters.put("path", String.format("/1/%s", command.httpPath));
+        requestParameters.put("path", new URL(server, command.httpPath).getPath());
         JSONObject body = command.jsonParameters;
         if (body != null) {
           requestParameters.put("body", body);
@@ -73,6 +75,8 @@ public static List<Task<JSONObject>> executeBatch(
       parameters.put("requests", requests);
     } catch (JSONException e) {
       throw new RuntimeException(e);
+    } catch (MalformedURLException e) {
+      throw new RuntimeException(e);
     }
 
     ParseRESTCommand command = new ParseRESTObjectBatchCommand(
diff --git a/Parse/src/test/java/com/parse/NetworkObjectControllerTest.java b/Parse/src/test/java/com/parse/NetworkObjectControllerTest.java
@@ -13,12 +13,16 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +40,16 @@
 @Config(constants = BuildConfig.class, sdk = 21)
 public class NetworkObjectControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testFetchAsync
 
   @Test
diff --git a/Parse/src/test/java/com/parse/NetworkQueryControllerTest.java b/Parse/src/test/java/com/parse/NetworkQueryControllerTest.java
@@ -11,8 +11,12 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
 import bolts.Task;
@@ -23,6 +27,16 @@
 
 public class NetworkQueryControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testConvertFindResponse
 
   @Test
diff --git a/Parse/src/test/java/com/parse/NetworkSessionControllerTest.java b/Parse/src/test/java/com/parse/NetworkSessionControllerTest.java
@@ -10,11 +10,15 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
@@ -26,6 +30,16 @@
 @Config(constants = BuildConfig.class, sdk = 21)
 public class NetworkSessionControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testGetSessionAsync
 
   @Test
diff --git a/Parse/src/test/java/com/parse/NetworkUserControllerTest.java b/Parse/src/test/java/com/parse/NetworkUserControllerTest.java
@@ -10,11 +10,15 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +31,16 @@
 @Config(constants = BuildConfig.class, sdk = 21)
 public class NetworkUserControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testSignUpAsync
 
   @Test
diff --git a/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java b/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java
@@ -9,12 +9,16 @@
 package com.parse;
 
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,6 +39,16 @@
 @Config(constants = BuildConfig.class, sdk = 21)
 public class ParseAnalyticsControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testConstructor
 
   @Test
diff --git a/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java b/Parse/src/test/java/com/parse/ParseClientConfigurationTest.java
@@ -30,12 +30,14 @@ public void testBuilder() {
     Parse.Configuration.Builder builder = new Parse.Configuration.Builder(null);
     builder.applicationId("foo");
     builder.clientKey("bar");
+    builder.server("some.server");
     builder.enableLocalDataStore();
     Parse.Configuration configuration = builder.build();
 
     assertNull(configuration.context);
     assertEquals(configuration.applicationId, "foo");
     assertEquals(configuration.clientKey, "bar");
+    assertEquals(configuration.server, "some.server");
     assertEquals(configuration.localDataStoreEnabled, true);
   }
 
diff --git a/Parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java b/Parse/src/test/java/com/parse/ParseCloudCodeControllerTest.java
@@ -13,10 +13,14 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 
@@ -36,6 +40,16 @@
 
 public class ParseCloudCodeControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   //region testConstructor
 
   @Test
diff --git a/Parse/src/test/java/com/parse/ParseConfigControllerTest.java b/Parse/src/test/java/com/parse/ParseConfigControllerTest.java
@@ -12,12 +12,16 @@
 import com.parse.http.ParseHttpResponse;
 
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -42,6 +46,16 @@
 
 public class ParseConfigControllerTest {
 
+  @Before
+  public void setUp() throws MalformedURLException {
+    ParseRESTCommand.server = new URL("https://api.parse.com/1");
+  }
+
+  @After
+  public void tearDown() {
+    ParseRESTCommand.server = null;
+  }
+
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
diff --git a/Parse/src/test/java/com/parse/ParseFileControllerTest.java b/Parse/src/test/java/com/parse/ParseFileControllerTest.java
diff --git a/Parse/src/test/java/com/parse/ParsePushControllerTest.java b/Parse/src/test/java/com/parse/ParsePushControllerTest.java
diff --git a/Parse/src/test/java/com/parse/ParseRESTCommandTest.java b/Parse/src/test/java/com/parse/ParseRESTCommandTest.java
diff --git a/Parse/src/test/java/com/parse/ParseRESTQueryCommandTest.java b/Parse/src/test/java/com/parse/ParseRESTQueryCommandTest.java
diff --git a/Parse/src/test/java/com/parse/ParseRESTUserCommandTest.java b/Parse/src/test/java/com/parse/ParseRESTUserCommandTest.java
