Merge branch 'develop' into 11-proxy

Author: dnl-blkv

.gitignore

@@ -69,6 +69,5 @@ gradle-app.setting
 # bunq-specific
 bunq.conf
 context-save-restore-test.conf
-tmp/attachment_out.jpg
 /tmp
 config.properties

src/main/java/com/bunq/sdk/context/ApiContext.java

@@ -8,7 +8,6 @@
 import com.bunq.sdk.model.generated.Session;
 import com.bunq.sdk.security.SecurityUtils;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import java.io.File;
@@ -145,14 +144,20 @@ public static ApiContext restore(String fileName) {
     try {
       File file = new File(fileName);
       String json = FileUtils.readFileToString(file, ENCODING_BUNQ_CONF);
-      JsonObject jsonObject = gson.fromJson(json, JsonObject.class);
 
-      return gson.fromJson(jsonObject, ApiContext.class);
+      return fromJson(json);
     } catch (IOException exception) {
       throw new BunqException(ERROR_COULD_NOT_RESTORE_API_CONTEXT, exception);
     }
   }
 
+  /**
+   * Restores a context from a given JSON string.
+   */
+  public static ApiContext fromJson(String json) {
+    return gson.fromJson(json, ApiContext.class);
+  }
+
   private void initialize(String deviceDescription, List<String> permittedIps) {
     /* The calls below are order-sensitive: to initialize a Device Registration, we need an
      * Installation, and to initialize a Session we need a Device Registration. */
@@ -254,13 +259,19 @@ public void save() {
   public void save(String fileName) {
     try {
       File file = new File(fileName);
-      String json = gson.toJson(this);
-      FileUtils.writeStringToFile(file, json, ENCODING_BUNQ_CONF);
+      FileUtils.writeStringToFile(file, toJson(), ENCODING_BUNQ_CONF);
     } catch (IOException exception) {
       throw new BunqException(ERROR_COULD_NOT_SAVE_API_CONTEXT, exception);
     }
   }
 
+  /**
+   * Serializes the context to JSON.
+   */
+  public String toJson() {
+    return gson.toJson(this);
+  }
+
   /**
    * @return The base URI of the current environment.
    */

src/test/java/com/bunq/sdk/context/ApiContextTest.java

@@ -0,0 +1,44 @@
+package com.bunq.sdk.context;
+
+import static org.junit.Assert.assertEquals;
+
+import com.bunq.sdk.BunqSdkTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests:
+ * ApiContext
+ */
+public class ApiContextTest extends BunqSdkTestBase {
+
+  /**
+   * Path to a temporary context file.
+   */
+  private static final String CONTEXT_FILENAME_TEST = "context-save-restore-test.conf";
+
+  private static ApiContext apiContext;
+
+  @BeforeClass
+  public static void setUpBeforeClass() {
+    apiContext = getApiContext();
+  }
+
+  @Test
+  public void apiContextSerializeDeserializeTest() {
+    String apiContextJson = apiContext.toJson();
+    ApiContext apiContextDeSerialised = ApiContext.fromJson(apiContextJson);
+
+    assertEquals(apiContextJson, apiContextDeSerialised.toJson());
+  }
+
+  @Test
+  public void apiContextSaveRestoreTest() {
+    String apiContextJson = apiContext.toJson();
+    apiContext.save(CONTEXT_FILENAME_TEST);
+    ApiContext apiContextRestored = ApiContext.restore(CONTEXT_FILENAME_TEST);
+
+    assertEquals(apiContextJson, apiContextRestored.toJson());
+  }
+
+}