Merge branch 'release-0.10.0'

Author: dnl-blkv

.gitignore

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

.idea/misc.xml

@@ -1,7 +1,8 @@
 group 'com.bunq.sdk'
-version '0.9.1'
+version '0.10.0'
 
 apply plugin: 'java'
+apply plugin: 'maven'
 sourceCompatibility = 1.8
 
 repositories {

.idea/modules.xml

@@ -2,23 +2,24 @@
 
 import com.bunq.sdk.exception.BunqException;
 import com.bunq.sdk.json.BunqGsonBuilder;
-import com.bunq.sdk.model.DeviceServer;
 import com.bunq.sdk.model.Installation;
 import com.bunq.sdk.model.SessionServer;
+import com.bunq.sdk.model.generated.DeviceServer;
 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 com.sun.istack.internal.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.security.KeyPair;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 
 /**
@@ -81,6 +82,10 @@ public class ApiContext implements java.io.Serializable {
   @SerializedName("session_context")
   private SessionContext sessionContext;
 
+  @Expose
+  @SerializedName("proxy")
+  private String proxy;
+
   /**
    * Create an empty API context.
    */
@@ -90,19 +95,36 @@ private ApiContext(ApiEnvironmentType environmentType, String apiKey) {
   }
 
   /**
-   * Create and initialize an API Context with current IP as permitted.
+   * Create and initialize an API Context with current IP as permitted and no proxy.
    */
   public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
       String deviceDescription) {
     return create(environmentType, apiKey, deviceDescription, new ArrayList<>());
   }
 
   /**
-   * Create and initialize an API Context.
+   * Create and initialize an API Context with given permitted ips and no proxy.
    */
   public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
       String deviceDescription, List<String> permittedIps) {
+    return create(environmentType, apiKey, deviceDescription, permittedIps, null);
+  }
+
+  /**
+   * Create and initialize an API Context with current IP as permitted and a proxy.
+   */
+  public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
+      String deviceDescription, String proxy) {
+    return create(environmentType, apiKey, deviceDescription, new ArrayList<>(), proxy);
+  }
+
+  /**
+   * Create and initialize an API Context.
+   */
+  public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
+      String deviceDescription, List<String> permittedIps, String proxy) {
     ApiContext apiContext = new ApiContext(environmentType, apiKey);
+    apiContext.proxy = proxy;
     apiContext.initialize(deviceDescription, permittedIps);
 
     return apiContext;
@@ -122,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. */
@@ -146,19 +174,31 @@ private void initializeInstallation() {
     Installation installation = Installation.create(
         this,
         SecurityUtils.getPublicKeyFormattedString(keyPairClient.getPublic())
-    );
+    ).getValue();
     installationContext = new InstallationContext(installation, keyPairClient);
   }
 
   private void initializeDeviceRegistration(String deviceDescription, List<String> permittedIps) {
-    DeviceServer.create(this, deviceDescription, permittedIps);
+    Map<String, Object> deviceServerRequestBody = generateDeviceServerRequestBodyBytes(
+        deviceDescription, permittedIps);
+    DeviceServer.create(this, deviceServerRequestBody);
+  }
+
+  private Map<String, Object> generateDeviceServerRequestBodyBytes(String description,
+      List<String> permittedIps) {
+    HashMap<String, Object> deviceServerRequestBody = new HashMap<>();
+    deviceServerRequestBody.put(DeviceServer.FIELD_DESCRIPTION, description);
+    deviceServerRequestBody.put(DeviceServer.FIELD_SECRET, apiKey);
+    deviceServerRequestBody.put(DeviceServer.FIELD_PERMITTED_IPS, permittedIps);
+
+    return deviceServerRequestBody;
   }
 
   /**
    * Create a new session and its data in a SessionContext.
    */
   private void initializeSession() {
-    sessionContext = new SessionContext(SessionServer.create(this));
+    sessionContext = new SessionContext(SessionServer.create(this).getValue());
   }
 
   /**
@@ -219,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.
    */
@@ -264,4 +310,8 @@ public SessionContext getSessionContext() {
     return sessionContext;
   }
 
+  public String getProxy() {
+    return proxy;
+  }
+
 }

build.gradle

@@ -2,6 +2,7 @@
 
 import com.bunq.sdk.context.ApiContext;
 import com.bunq.sdk.http.ApiClient;
+import com.bunq.sdk.http.BunqResponse;
 import com.bunq.sdk.model.generated.AttachmentPublic;
 import com.bunq.sdk.model.generated.AttachmentPublicContent;
 import java.io.File;
@@ -32,9 +33,9 @@ public static void main(String[] args) throws IOException {
 
     try {
       byte[] requestBytes = FileUtils.readFileToByteArray(new File(PATH_ATTACHMENT_IN));
-      String uuid = AttachmentPublic.create(apiContext, requestBytes, customHeaders);
-      byte[] responseBytes = AttachmentPublicContent.list(apiContext, uuid);
-      FileUtils.writeByteArrayToFile(new File(PATH_ATTACHMENT_OUT), responseBytes);
+      String uuid = AttachmentPublic.create(apiContext, requestBytes, customHeaders).getValue();
+      BunqResponse<byte[]> response = AttachmentPublicContent.list(apiContext, uuid);
+      FileUtils.writeByteArrayToFile(new File(PATH_ATTACHMENT_OUT), response.getValue());
       apiContext.save();
     } catch (IOException exception) {
       System.out.print(exception.getMessage());

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

@@ -37,7 +37,7 @@ public static void main(String[] args) throws IOException {
     pointer.setName(POINTER_NAME_TEST);
     requestMap.put(CardDebit.FIELD_ALIAS, pointer);
 
-    System.out.println(CardDebit.create(apiContext, requestMap, USER_ITEM_ID).getId());
+    System.out.println(CardDebit.create(apiContext, requestMap, USER_ITEM_ID).getValue().getId());
   }
 
   private static String generateRandomSecondLine() {

src/main/java/com/bunq/sdk/examples/AttachmentPublicExample.java

@@ -43,10 +43,11 @@ public static void main(String[] args) {
     Date dateEnd = new Date();
 
     customerStatementMap.put(CustomerStatementExport.FIELD_DATE_END, formatDate.format(dateEnd));
-    int userId = User.list(apiContext).get(INDEX_FIRST).getUserCompany().getId();
-    int monetaryAccountId = MonetaryAccountBank.list(apiContext, userId).get(INDEX_FIRST).getId();
+    int userId = User.list(apiContext).getValue().get(INDEX_FIRST).getUserCompany().getId();
+    int monetaryAccountId = MonetaryAccountBank.list(apiContext, userId).getValue().get(INDEX_FIRST)
+        .getId();
     int customerStatementId = CustomerStatementExport.create(apiContext, customerStatementMap,
-        userId, monetaryAccountId);
+        userId, monetaryAccountId).getValue();
 
     CustomerStatementExport.delete(apiContext, userId, monetaryAccountId, customerStatementId);
 

src/main/java/com/bunq/sdk/examples/CardDebitExample.java

@@ -21,7 +21,7 @@ public static void main(String[] args) {
         apiContext,
         USER_ITEM_ID,
         MONETARY_ACCOUNT_ITEM_ID
-    );
+    ).getValue();
 
     System.out.println(monetaryAccount.getMonetaryAccountBank());
   }

src/main/java/com/bunq/sdk/examples/CustomerStatementExportExample.java

@@ -52,7 +52,7 @@ public static void main(String[] args) {
         paymentBatchMap,
         USER_ITEM_ID,
         MONETARY_ACCOUNT_ITEM_ID
-    );
+    ).getValue();
 
     System.out.println(
         PaymentBatch.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentBatchId)

src/main/java/com/bunq/sdk/examples/MonetaryAccountExample.java

@@ -32,8 +32,9 @@ public static void main(String[] args) {
         generateExamplePaymentMap(),
         USER_ITEM_ID,
         MONETARY_ACCOUNT_ITEM_ID
-    );
-    Payment payment = Payment.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId);
+    ).getValue();
+    Payment payment = Payment.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId)
+        .getValue();
     System.out.println(payment);
   }
 

src/main/java/com/bunq/sdk/examples/PaymentBatchExample.java

@@ -18,7 +18,8 @@ public class PaymentListExample {
    */
   public static void main(String[] args) {
     ApiContext apiContext = ApiContext.restore(API_CONTEXT_FILE_PATH);
-    List<Payment> payments = Payment.list(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID);
+    List<Payment> payments = Payment.list(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID)
+        .getValue();
     printPayments(payments);
   }
 

src/main/java/com/bunq/sdk/examples/PaymentExample.java

@@ -45,7 +45,7 @@ public static void main(String[] args) {
         requestMap,
         USER_ITEM_ID,
         MONETARY_ACCOUNT_ITEM_ID
-    );
+    ).getValue();
 
     System.out.println(
         RequestInquiry.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, requestId)

src/main/java/com/bunq/sdk/examples/PaymentListExample.java

@@ -16,7 +16,7 @@ public class UserListExample {
    */
   public static void main(String[] args) {
     ApiContext apiContext = ApiContext.restore(API_CONTEXT_FILE_PATH);
-    List<User> users = User.list(apiContext);
+    List<User> users = User.list(apiContext).getValue();
     apiContext.save();
 
     for (User oneUser : users) {