Merge branch 'release/0.12.4'

Author: Kevin Hellemun

.gitignore

@@ -72,3 +72,4 @@ context-save-restore-test.conf
 /tmp
 config.properties
 bunq-test.conf
+.idea/codeStyles/

CHANGELOG.md

@@ -0,0 +1,115 @@
+# Change Log
+
+## [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)
+
+**Implemented enhancements:**
+
+- Introduce fromJson method [\#51](https://github.com/bunq/sdk_java/issues/51)
+- Make sure received signatures headers are correctly cased [\#43](https://github.com/bunq/sdk_java/issues/43)
+- Remove guava  [\#41](https://github.com/bunq/sdk_java/issues/41)
+- 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)
+
+**Fixed bugs:**
+
+- Remove guava  [\#41](https://github.com/bunq/sdk_java/issues/41)
+
+**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)
+
+**Implemented enhancements:**
+
+- Callback models for holding callback data  [\#33](https://github.com/bunq/sdk_java/issues/33)
+- Feature/callback models bunq/sdk java\#33 [\#36](https://github.com/bunq/sdk_java/pull/36) ([OGKevin](https://github.com/OGKevin))
+
+**Fixed bugs:**
+
+- ScheduledPayment causes decode error due to Typo [\#37](https://github.com/bunq/sdk_java/issues/37)
+
+## [0.12.2](https://github.com/bunq/sdk_java/tree/0.12.2) (2017-11-08)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/0.12.0...0.12.2)
+
+**Implemented enhancements:**
+
+- Add missing fields for cvc endpoint [\#30](https://github.com/bunq/sdk_java/issues/30)
+- Missing CARD GENERATED CVC2 endpoint [\#26](https://github.com/bunq/sdk_java/issues/26)
+- More flexibility for sessionContext handling [\#23](https://github.com/bunq/sdk_java/issues/23)
+- Added cvc\_endpoint. \#26 [\#27](https://github.com/bunq/sdk_java/pull/27) ([OGKevin](https://github.com/OGKevin))
+- Added isExpired\(\) method \#23. [\#24](https://github.com/bunq/sdk_java/pull/24) ([OGKevin](https://github.com/OGKevin))
+
+**Fixed bugs:**
+
+- DraftPayment object field causes converter error  [\#29](https://github.com/bunq/sdk_java/issues/29)
+
+**Merged pull requests:**
+
+- Feature/fix draft payment object \#29 [\#32](https://github.com/bunq/sdk_java/pull/32) ([OGKevin](https://github.com/OGKevin))
+- Feature/add missing cvc fields \#30 [\#31](https://github.com/bunq/sdk_java/pull/31) ([OGKevin](https://github.com/OGKevin))
+
+## [0.12.0](https://github.com/bunq/sdk_java/tree/0.12.0) (2017-10-11)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/0.11.0...0.12.0)
+
+**Implemented enhancements:**
+
+- Update read me with installation instructions  [\#21](https://github.com/bunq/sdk_java/issues/21)
+- Better error handling [\#17](https://github.com/bunq/sdk_java/issues/17)
+- Response is missing response headers and pagination [\#4](https://github.com/bunq/sdk_java/issues/4)
+- Feature/exception handler [\#18](https://github.com/bunq/sdk_java/pull/18) ([OGKevin](https://github.com/OGKevin))
+- Marked all files in generated dir as generated code. [\#16](https://github.com/bunq/sdk_java/pull/16) ([OGKevin](https://github.com/OGKevin))
+
+**Closed issues:**
+
+- Improve Model Namespaces [\#19](https://github.com/bunq/sdk_java/issues/19)
+
+**Merged pull requests:**
+
+- cleanup after 19-improve-namespaces [\#22](https://github.com/bunq/sdk_java/pull/22) ([dnl-blkv](https://github.com/dnl-blkv))
+- Fix namespaces; cleanup tests; kill formatting of generated files \[\#19\] [\#20](https://github.com/bunq/sdk_java/pull/20) ([dnl-blkv](https://github.com/dnl-blkv))
+
+## [0.11.0](https://github.com/bunq/sdk_java/tree/0.11.0) (2017-09-06)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/0.10.0...0.11.0)
+
+**Implemented enhancements:**
+
+- Ignore generated code for reviews [\#14](https://github.com/bunq/sdk_java/issues/14)
+- Added git attributes. [\#15](https://github.com/bunq/sdk_java/pull/15) ([OGKevin](https://github.com/OGKevin))
+
+**Merged pull requests:**
+
+- Add pagination; cleanup; add missing endpoints and fields \[\#4\] [\#13](https://github.com/bunq/sdk_java/pull/13) ([dnl-blkv](https://github.com/dnl-blkv))
+
+## [0.10.0](https://github.com/bunq/sdk_java/tree/0.10.0) (2017-08-23)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/0.9.1...0.10.0)
+
+**Implemented enhancements:**
+
+- Add Proxy Support [\#11](https://github.com/bunq/sdk_java/issues/11)
+- Allow saving context to JSON and restoring from it [\#9](https://github.com/bunq/sdk_java/issues/9)
+- Add proxy support and missing .gitignore entry \[\#11\] [\#12](https://github.com/bunq/sdk_java/pull/12) ([dnl-blkv](https://github.com/dnl-blkv))
+- add methods to save ApiContext to JSON and restore it from JSON \[\#9\] [\#10](https://github.com/bunq/sdk_java/pull/10) ([dnl-blkv](https://github.com/dnl-blkv))
+- \#4 Introduce BunqResponse [\#5](https://github.com/bunq/sdk_java/pull/5) ([dnl-blkv](https://github.com/dnl-blkv))
+
+**Fixed bugs:**
+
+- SDK build fails on jitpack [\#6](https://github.com/bunq/sdk_java/issues/6)
+- Fix Jitpack build, add misssing fields, fix field types in generated \[\#6\] [\#8](https://github.com/bunq/sdk_java/pull/8) ([dnl-blkv](https://github.com/dnl-blkv))
+
+## [0.9.1](https://github.com/bunq/sdk_java/tree/0.9.1) (2017-08-08)
+**Implemented enhancements:**
+
+- Added tests readme [\#3](https://github.com/bunq/sdk_java/pull/3) ([OGKevin](https://github.com/OGKevin))
+- Add first series of unit-tests [\#1](https://github.com/bunq/sdk_java/pull/1) ([OGKevin](https://github.com/OGKevin))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

build.gradle

@@ -1,5 +1,5 @@
 group 'com.bunq.sdk'
-version '0.12.3'
+version '0.12.4'
 
 apply plugin: 'java'
 apply plugin: 'maven'
@@ -16,8 +16,6 @@ dependencies {
     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'
-    // https://mvnrepository.com/artifact/com.google.guava/guava
-    compile group: 'com.google.guava', name: 'guava', version: '22.0'
     // 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

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

@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 
 /**
@@ -284,8 +283,7 @@ public URI getBaseUri() {
    * @return The session token, installation token if the session isn't created yet, or null if no
    * installation is created either.
    */
-  public @Nullable
-  String getSessionToken() {
+  public String getSessionToken() {
     if (sessionContext != null) {
       return sessionContext.getToken();
     } else if (installationContext != null) {

src/main/java/com/bunq/sdk/http/ApiClient.java

@@ -44,6 +44,7 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
 
@@ -93,7 +94,7 @@ public class ApiClient {
   /**
    * Prefix for bunq's own headers.
    */
-  private static final String USER_AGENT_BUNQ = "bunq-sdk-java/0.12.3";
+  private static final String USER_AGENT_BUNQ = "bunq-sdk-java/0.12.4";
   private static final String LANGUAGE_EN_US = "en_US";
   private static final String REGION_NL_NL = "nl_NL";
   private static final String GEOLOCATION_ZERO = "0 0 0 0 000";
@@ -225,19 +226,13 @@ private String getVersion() {
 
   private BunqResponseRaw createBunqResponseRaw(CloseableHttpResponse response)
       throws IOException {
-    byte[] responseBodyBytes = getBodyBytes(response);
-
-    return new BunqResponseRaw(responseBodyBytes, getHeadersMap(response));
-  }
-
-  private byte[] getBodyBytes(CloseableHttpResponse response) throws IOException {
     Integer responseCode = response.getStatusLine().getStatusCode();
     byte[] responseBodyBytes = EntityUtils.toByteArray(response.getEntity());
 
     assertResponseSuccess(responseCode, responseBodyBytes);
     validateResponseSignature(responseCode, responseBodyBytes, response);
 
-    return responseBodyBytes;
+    return new BunqResponseRaw(responseBodyBytes, getHeadersMap(response));
   }
 
   private static void assertResponseSuccess(int responseCode, byte[] responseBodyBytes) {

src/main/java/com/bunq/sdk/json/AnchorObjectAdapter.java

@@ -0,0 +1,48 @@
+package com.bunq.sdk.json;
+
+import com.bunq.sdk.exception.BunqException;
+import com.bunq.sdk.model.core.AnchorObjectInterface;
+import com.bunq.sdk.model.core.BunqModel;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.Gson;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+public class AnchorObjectAdapter implements JsonDeserializer<AnchorObjectInterface> {
+  @Override
+  public AnchorObjectInterface deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+      throws JsonParseException {
+    AnchorObjectInterface model = new Gson().fromJson(json, typeOfT);
+
+    if (model.isAllFieldNull()) {
+      Field[] allFields = model.getClass().getDeclaredFields();
+
+      for(Field field : allFields) {
+        if (!BunqModel.class.isAssignableFrom(field.getType())) {
+          continue;
+        }
+
+        BunqModel content = new Gson().fromJson(json, (Type) field.getType());
+        field.setAccessible(true);
+
+        try {
+          if (content.isAllFieldNull()) {
+            field.set(model, null);
+          } else {
+            field.set(model, content);
+          }
+        } catch (IllegalAccessException e) {
+          throw new BunqException(e.getMessage());
+        }
+
+        field.setAccessible(false);
+      }
+    }
+
+    return model;
+  }
+}

src/main/java/com/bunq/sdk/json/BunqGsonBuilder.java

@@ -2,6 +2,7 @@
 
 import com.bunq.sdk.context.InstallationContext;
 import com.bunq.sdk.http.Pagination;
+import com.bunq.sdk.model.core.AnchorObjectInterface;
 import com.bunq.sdk.model.core.Installation;
 import com.bunq.sdk.model.core.MonetaryAccountReference;
 import com.bunq.sdk.model.core.SessionServer;
@@ -33,7 +34,8 @@ public static GsonBuilder buildDefault() {
             new MonetaryAccountReferenceTypeAdapter()
         )
         .registerTypeAdapter(InstallationContext.class, new InstallationContextAdapter())
-        .registerTypeAdapter(Pagination.class, new PaginationAdapter());
+        .registerTypeAdapter(Pagination.class, new PaginationAdapter())
+        .registerTypeHierarchyAdapter(AnchorObjectInterface.class, new AnchorObjectAdapter());
   }
 
 }

src/main/java/com/bunq/sdk/json/GeolocationTypeAdapter.java

@@ -7,7 +7,6 @@
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
-import javax.annotation.Nullable;
 
 /**
  * Custom (de)serialization of Geolocation for GSON, required because Geolocation uses BiDecimal's,
@@ -33,7 +32,6 @@ public JsonElement serialize(Geolocation geolocation, Type typeOfSrc,
     return jsonObject;
   }
 
-  @Nullable
   private String getBigDecimalStringOrNull(BigDecimal bigDecimal) {
     if (bigDecimal == null) {
       return null;

src/main/java/com/bunq/sdk/model/core/AnchorObjectInterface.java

@@ -0,0 +1,11 @@
+package com.bunq.sdk.model.core;
+
+public interface AnchorObjectInterface {
+  /**
+   */
+  boolean isAllFieldNull();
+
+  /**
+   */
+  BunqModel getReferencedObject();
+}

src/main/java/com/bunq/sdk/model/core/BunqModel.java

@@ -8,6 +8,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.stream.JsonReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,6 +35,15 @@ abstract public class BunqModel {
   protected BunqModel() {
   }
 
+  /**
+   */
+  public static <T> T fromJsonReader(Class<T> tClass, JsonReader reader) {
+    return gson.fromJson(
+        reader,
+        tClass
+    );
+  }
+
   /**
    * De-serializes an object from a JSON format specific to Installation and SessionServer.
    */
@@ -147,4 +157,8 @@ public String toString() {
     return gson.toJson(this);
   }
 
+  /**
+   */
+  abstract public boolean isAllFieldNull();
+
 }