Convert ParseConfig JSON constructor to factory method

Author: grantland

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

@@ -103,14 +103,14 @@ public Task<ParseConfig> then(Task<Void> task) throws Exception {
     });
   }
 
-  // TODO(grantland): /* package */ static ParseConfig decode(JSONObject json, ParseDecoder decoder) {
-  /* package */ ParseConfig(JSONObject json, ParseDecoder decoder) {
+  @SuppressWarnings("unchecked")
+  /* package */ static ParseConfig decode(JSONObject json, ParseDecoder decoder) {
     Map<String, Object> decodedObject = (Map<String, Object>) decoder.decode(json);
     Map<String, Object> decodedParams = (Map<String, Object>) decodedObject.get("params");
     if (decodedParams == null) {
       throw new RuntimeException("Object did not contain the 'params' key.");
     }
-    this.params = Collections.unmodifiableMap(decodedParams);
+    return new ParseConfig(decodedParams);
   }
 
   /* package */ ParseConfig(Map<String, Object> params) {

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

@@ -35,7 +35,7 @@ public Task<ParseConfig> getAsync(String sessionToken) {
       public Task<ParseConfig> then(Task<JSONObject> task) throws Exception {
         JSONObject result = task.getResult();
 
-        final ParseConfig config = new ParseConfig(result, ParseDecoder.get());
+        final ParseConfig config = ParseConfig.decode(result, ParseDecoder.get());
         return currentConfigController.setCurrentConfigAsync(config).continueWith(new Continuation<Void, ParseConfig>() {
           @Override
           public ParseConfig then(Task<Void> task) throws Exception {

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

@@ -68,7 +68,7 @@ public ParseConfig call() throws Exception {
     } catch (IOException | JSONException e) {
       return null;
     }
-    return new ParseConfig(json, ParseDecoder.get());
+    return ParseConfig.decode(json, ParseDecoder.get());
   }
 
   /* package */ void clearCurrentConfigForTesting() {

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

@@ -70,25 +70,25 @@ public void testDefaultConstructor() {
   }
 
   @Test
-  public void testConstructWithValidJsonObject() throws Exception {
+  public void testDecodeWithValidJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
     JSONObject json = new JSONObject();
     json.put("params", NoObjectsEncoder.get().encode(params));
 
-    ParseConfig config = new ParseConfig(json, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(json, ParseDecoder.get());
     assertEquals(1, config.params.size());
     assertEquals("value", config.params.get("string"));
   }
 
   @Test(expected = RuntimeException.class)
-  public void testConstructWithInvalidJsonObject() throws Exception {
+  public void testDecodeWithInvalidJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
     JSONObject json = new JSONObject();
     json.put("error", NoObjectsEncoder.get().encode(params));
 
-    new ParseConfig(json, ParseDecoder.get());
+    ParseConfig.decode(json, ParseDecoder.get());
   }
 
   //endregion

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

@@ -12,9 +12,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -87,7 +84,7 @@ public void testSaveToDiskSuccess() throws Exception {
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig config = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
 
     // Save to disk
     File configFile = new File(temporaryFolder.getRoot(), "config");
@@ -164,7 +161,7 @@ public void testGetFromDiskSuccess() throws Exception {
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig config = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
 
     // Save to disk
     File configFile = new File(temporaryFolder.getRoot(), "config");
@@ -272,7 +269,7 @@ public void testGetCurrentConfigAsyncSuccessCurrentConfigNotSetDiskConfigExist()
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig diskConfig = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig diskConfig = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
     currentConfigController.saveToDisk(diskConfig);
 
     // Verify before set, disk config exist and in memory config is null