Merge branch 'release/0.13.0'

Author: Kevin Hellemun

.github/ISSUE_TEMPLATE.md

@@ -7,9 +7,17 @@
 ## What happens:
 1.
 
-## Logs
-- Logs
+## Traceback
+[//]: # (If there is a traceback please share it in a quote! You can do this by pasting the traceback text, highlighting it and pressing the quote button.)
 
-## Extra info:
-- Tested on
+## SDK version and environment
+- Tested on [0.12.4](https://github.com/bunq/sdk_java/releases/tag/0.12.4)
+- [ ] Sandbox
+- [ ] Production
+
+## Response id
+[//]: # (If this error has something to do with a request that fails, please provide the response id of the request.)
+- Response id:
 
+## Extra info:
+[//]: # (Please provide any other relevant information here)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+[//]: # (Thanks for opening this pull request! Before you proceed please make sure that you have an issue that explains what this pull request will do.
+         Make sure that all your commits link to this issue e.g. "My commit. \(bunq/sdk_java#<issue nr>\)".
+         If this pull request is changing files that are located in "com.bunq.sdk.model.generated" then this pull request will be closed as these files must/can only be changed on bunq's side.)
+         
+## This PR closes/fixes the following issues:
+[//]: # (If for some reason your pull request does not require a test case you can just mark this box as checked and explain why it does not require a test case.)
+ - Closes bunq/sdk_java#
+    - [ ] Tested

.zappr.yaml

@@ -0,0 +1,25 @@
+autobranch:
+  pattern: 'bunq/sdk_java#{number}-{title}'
+  length: 100
+commit:
+  message:
+    patterns:
+      - '([A-Za-z0-9 ]+)\. (\(bunq\/sdk_java#[0-9]+\))'
+specification:
+  title:
+    minimum-length:
+      enabled: true
+      length: 8
+  body:
+    minimum-length:
+      enabled: true
+      length: 8
+    contains-url: true
+    contains-issue-number: true
+  template:
+    differs-from-body: true
+pull-request:
+  labels:
+    additional: true
+    required:
+      - Can be merged

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## [0.13.0](https://github.com/bunq/sdk_java/tree/0.13.0) [(2017-12-21)](https://github.com/bunq/sdk_java/tree/0.13.0)
+
+[Full Changelog](https://github.com/bunq/sdk_java/compare/0.12.4...0.13.0)
+
+**Implemented enhancements:**
+
+- Add zappr integration for better quality control  [\#58](https://github.com/bunq/sdk_java/issues/58)
+- Add more information to templates [\#56](https://github.com/bunq/sdk_java/issues/56)
+- Add response id to error messages from failed requests  [\#55](https://github.com/bunq/sdk_java/issues/55)
+
+**Fixed bugs:**
+
+- Token request ideal is missing id attribute in response. [\#65](https://github.com/bunq/sdk_java/issues/65)
+- getCounterpartyAlias\(\) returns null on payments [\#49](https://github.com/bunq/sdk_java/issues/49)
+- Field ID is missing from MasterCardAction [\#48](https://github.com/bunq/sdk_java/issues/48)
+- TokenQrRequestIdeal returns the wrong type [\#47](https://github.com/bunq/sdk_java/issues/47)
+- Cannot list draft payments for monetary account [\#46](https://github.com/bunq/sdk_java/issues/46)
+
+**Closed issues:**
+
+- bunq update 7 [\#75](https://github.com/bunq/sdk_java/issues/75)
+- Serialization Error [\#71](https://github.com/bunq/sdk_java/issues/71)
+- Clean dependencies [\#25](https://github.com/bunq/sdk_java/issues/25)
+
+**Merged pull requests:**
+
+- Bunq update 7  [\#76](https://github.com/bunq/sdk_java/pull/76) ([OGKevin](https://github.com/OGKevin))
+- Regenerate code for release [\#74](https://github.com/bunq/sdk_java/pull/74) ([OGKevin](https://github.com/OGKevin))
+- Replaced httpclient with Okhttp. \(bunq/sdk\_java\#25\) [\#73](https://github.com/bunq/sdk_java/pull/73) ([OGKevin](https://github.com/OGKevin))
+- Regenerated code to add corerct object types. \(bunq/sdk\_java\#47\) [\#70](https://github.com/bunq/sdk_java/pull/70) ([OGKevin](https://github.com/OGKevin))
+- Fixed MonetaryAccountReferenceTypeAdapter to output proper value. \(bunq/sdk\_java\#49\) [\#68](https://github.com/bunq/sdk_java/pull/68) ([OGKevin](https://github.com/OGKevin))
+- Added missing field id for TokenQrRequestIdeal. \(bunq/sdk\_java\#65\) [\#67](https://github.com/bunq/sdk_java/pull/67) ([OGKevin](https://github.com/OGKevin))
+- Cannot list payments due to geolocation. \(Bunq/sdk\_java\#46 \) [\#64](https://github.com/bunq/sdk_java/pull/64) ([OGKevin](https://github.com/OGKevin))
+- Get counterparty alias returns null on payments. \(Bunq/sdk\_java\#49 \) [\#63](https://github.com/bunq/sdk_java/pull/63) ([OGKevin](https://github.com/OGKevin))
+- Added missing id field from mastercard action. \(bunq/sdk\_java\#48\) [\#62](https://github.com/bunq/sdk_java/pull/62) ([OGKevin](https://github.com/OGKevin))
+- \(bunq/sdk\_java\#55\) add response id to request error [\#61](https://github.com/bunq/sdk_java/pull/61) ([OGKevin](https://github.com/OGKevin))
+- Configure Zappr [\#59](https://github.com/bunq/sdk_java/pull/59) ([OGKevin](https://github.com/OGKevin))
+- Improve issue and pr template. \(bunq/sdk\_java\#56\) [\#57](https://github.com/bunq/sdk_java/pull/57) ([OGKevin](https://github.com/OGKevin))
+
 ## [0.12.4](https://github.com/bunq/sdk_java/tree/0.12.4) (2017-12-21)
 [Full Changelog](https://github.com/bunq/sdk_java/compare/0.12.3...0.12.4)
 
@@ -11,18 +50,18 @@
 - Return base class from createFromJsonString [\#40](https://github.com/bunq/sdk_java/issues/40)
 - CHANGELOG.md is empty [\#38](https://github.com/bunq/sdk_java/issues/38)
 - Improve decoder to recognise child object  [\#35](https://github.com/bunq/sdk_java/issues/35)
+- Removed guava as dependency. \(bunq/sdk\_java\#41\) [\#44](https://github.com/bunq/sdk_java/pull/44) ([OGKevin](https://github.com/OGKevin))
+- Generated CHANGELOG.md :clap:. \(bunq/sdk\_java\#38\) [\#39](https://github.com/bunq/sdk_java/pull/39) ([OGKevin](https://github.com/OGKevin))
 
 **Fixed bugs:**
 
 - Remove guava  [\#41](https://github.com/bunq/sdk_java/issues/41)
+- Removed guava as dependency. \\(bunq/sdk\\_java\\#41\\) [\#44](https://github.com/bunq/sdk_java/pull/44) ([OGKevin](https://github.com/OGKevin))
 
 **Merged pull requests:**
 
 - Added method to ensure that reponse headers are correclty cased befor… [\#53](https://github.com/bunq/sdk_java/pull/53) ([OGKevin](https://github.com/OGKevin))
 - Feature/improve decoder bunq/sdk java\#35 [\#52](https://github.com/bunq/sdk_java/pull/52) ([OGKevin](https://github.com/OGKevin))
-- Removed guava as dependency. \(bunq/sdk\_java\#41\) [\#44](https://github.com/bunq/sdk_java/pull/44) ([OGKevin](https://github.com/OGKevin))
-- Generated CHANGELOG.md :clap:. \(bunq/sdk\_java\#38\) [\#39](https://github.com/bunq/sdk_java/pull/39) ([OGKevin](https://github.com/OGKevin))
-- Removed guava as dependency. \\(bunq/sdk\\_java\\#41\\) [\#44](https://github.com/bunq/sdk_java/pull/44) ([OGKevin](https://github.com/OGKevin))
 
 ## [0.12.3](https://github.com/bunq/sdk_java/tree/0.12.3) (2017-11-15)
 [Full Changelog](https://github.com/bunq/sdk_java/compare/0.12.2...0.12.3)

build.gradle

@@ -1,5 +1,5 @@
 group 'com.bunq.sdk'
-version '0.12.4'
+version '0.13.0'
 
 apply plugin: 'java'
 apply plugin: 'maven'
@@ -14,12 +14,11 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
-    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
     // https://mvnrepository.com/artifact/org.apache.commons/commons-io
     compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
     // https://mvnrepository.com/artifact/com.squareup.okio/okio
     compile group: 'com.squareup.okio', name: 'okio', version: '1.13.0'
 }
 
-apply plugin: 'idea'
+apply plugin: 'idea'

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

@@ -2,6 +2,7 @@
 
 import com.bunq.sdk.exception.BunqException;
 import com.bunq.sdk.json.BunqGsonBuilder;
+import com.bunq.sdk.model.core.DeviceServerInternal;
 import com.bunq.sdk.model.core.Installation;
 import com.bunq.sdk.model.core.SessionServer;
 import com.bunq.sdk.model.generated.endpoint.DeviceServer;
@@ -12,7 +13,6 @@
 import com.google.gson.annotations.SerializedName;
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.security.KeyPair;
 import java.util.ArrayList;
 import java.util.Date;
@@ -178,19 +178,7 @@ private void initializeInstallation() {
   }
 
   private void initializeDeviceRegistration(String deviceDescription, List<String> 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;
+    DeviceServerInternal.create(this, deviceDescription, this.apiKey, permittedIps);
   }
 
   /**
@@ -221,7 +209,7 @@ public void closeSession() {
   }
 
   private void deleteSession() {
-    Session.delete(this, SESSION_ID_DUMMY);
+    Session.delete(SESSION_ID_DUMMY);
   }
 
   /**
@@ -275,10 +263,14 @@ public String toJson() {
   /**
    * @return The base URI of the current environment.
    */
-  public URI getBaseUri() {
+  public String getBaseUri() {
     return environmentType.getBaseUri();
   }
 
+  public String getApiVersion() {
+    return environmentType.getApiVersion();
+  }
+
   /**
    * @return The session token, installation token if the session isn't created yet, or null if no
    * installation is created either.

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

@@ -1,35 +1,33 @@
 package com.bunq.sdk.context;
 
-import com.bunq.sdk.exception.UncaughtExceptionError;
-import java.net.URI;
-import java.net.URISyntaxException;
-
 /**
  * Enum for the API environment types and their URIs.
  */
 public enum ApiEnvironmentType {
 
-  PRODUCTION("https://api.bunq.com/v1/"),
-  SANDBOX("https://sandbox.public.api.bunq.com/v1/");
+  PRODUCTION("api.bunq.com", "v1"),
+  SANDBOX("sandbox.public.api.bunq.com", "v1");
 
   /**
    * Base URI of each given environment.
    */
   private String baseUri;
+  private String apiVersion;
 
-  ApiEnvironmentType(String baseUri) {
+  ApiEnvironmentType(String baseUri, String apiVersion) {
     this.baseUri = baseUri;
+    this.apiVersion = apiVersion;
   }
 
   /**
    * @return Base URI of the environment.
    */
-  URI getBaseUri() {
-    try {
-      return new URI(this.baseUri);
-    } catch (URISyntaxException exception) {
-      throw new UncaughtExceptionError(exception);
-    }
+  String getBaseUri() {
+    return this.baseUri;
+  }
+
+  String getApiVersion() {
+    return this.apiVersion;
   }
 
 }

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

@@ -0,0 +1,37 @@
+package com.bunq.sdk.context;
+
+import com.bunq.sdk.exception.BunqException;
+
+public final class BunqContext {
+
+  /**
+   * Error constatns.
+   */
+  private static final String ERROR_API_CONTEXT_HAS_NOT_BEEN_SET = "Api context has not been set";
+  private static final String ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET = "UserContext has not been set";
+
+  private static ApiContext apiContext;
+  private static UserContext userContext;
+
+  public static void loadApiContext(ApiContext apiContext) {
+    BunqContext.apiContext = apiContext;
+    BunqContext.userContext = new UserContext(apiContext.getSessionContext().getUserId());
+    BunqContext.userContext.initMainMonetaryAccount();
+  }
+
+  public static ApiContext getApiContext() {
+    if (apiContext == null) {
+      throw new BunqException(ERROR_API_CONTEXT_HAS_NOT_BEEN_SET);
+    }
+
+    return apiContext;
+  }
+
+  public static UserContext getUserContext() {
+    if (userContext == null) {
+      throw new BunqException(ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET);
+    }
+
+    return userContext;
+  }
+}

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

@@ -1,5 +1,7 @@
 package com.bunq.sdk.context;
 
+import com.bunq.sdk.exception.BunqException;
+import com.bunq.sdk.model.core.BunqModel;
 import com.bunq.sdk.model.core.SessionServer;
 import com.bunq.sdk.model.generated.endpoint.UserCompany;
 import com.bunq.sdk.model.generated.endpoint.UserPerson;
@@ -12,6 +14,11 @@
  */
 class SessionContext implements java.io.Serializable {
 
+  /**
+   * Error constants.
+   */
+  private static final String ERROR_UNEXPECTED_USER_TYPE = "Unexpected user type.";
+
   /**
    * Default assumed value for session timeout.
    */
@@ -36,12 +43,27 @@ class SessionContext implements java.io.Serializable {
   @SerializedName("expiry_time")
   private Date expiryTime;
 
+  @Expose
+  @SerializedName("user_id")
+  private Integer userId;
+
   /**
    * @param sessionServer Object containing the session info.
    */
   SessionContext(SessionServer sessionServer) {
     this.token = sessionServer.getSessionToken().getToken();
     this.expiryTime = calculateExpiryTime(sessionServer);
+    this.userId = getUserId(sessionServer.getReferencedObject());
+  }
+
+  private Integer getUserId(BunqModel user) {
+    if (user instanceof UserPerson) {
+      return ((UserPerson) user).getId();
+    } else if (user instanceof UserCompany) {
+      return  ((UserCompany) user).getId();
+    } else {
+      throw new BunqException(ERROR_UNEXPECTED_USER_TYPE);
+    }
   }
 
   private static Date calculateExpiryTime(SessionServer sessionServer) {
@@ -76,4 +98,8 @@ Date getExpiryTime() {
     return expiryTime;
   }
 
+  public Integer getUserId() {
+    return userId;
+  }
+
 }