Merge branch 'release/1.12.1'

Author: nickvandegroes

CHANGELOG.md

@@ -2,7 +2,18 @@
 
 ## [Unreleased](https://github.com/bunq/sdk_java/tree/HEAD)
 
-[Full Changelog](https://github.com/bunq/sdk_java/compare/1.10.16...HEAD)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/1.12.0...HEAD)
+
+**Closed issues:**
+
+- No payment details in the result inquiries of a bunq me tab in the api [\#114](https://github.com/bunq/sdk_java/issues/114)
+
+**Merged pull requests:**
+
+- Feature/object wrapping fix [\#119](https://github.com/bunq/sdk_java/pull/119) ([NickvandeGroes](https://github.com/NickvandeGroes))
+
+## [1.12.0](https://github.com/bunq/sdk_java/tree/1.12.0) (2019-09-10)
+[Full Changelog](https://github.com/bunq/sdk_java/compare/1.10.16...1.12.0)
 
 **Closed issues:**
 

build.gradle

@@ -1,5 +1,5 @@
 group 'com.bunq.sdk'
-version '1.12.0'
+version '1.12.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

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

@@ -18,7 +18,7 @@ public enum BunqHeader {
   LANGUAGE("X-Bunq-Language", "en_US"),
   REGION("X-Bunq-Region", "nl_NL"),
   SERVER_SIGNATURE("X-Bunq-Server-Signature"),
-  USER_AGENT("User-Agent", "bunq-sdk-java/1.12.0");
+  USER_AGENT("User-Agent", "bunq-sdk-java/1.12.1");
 
   private static final String PREFIX = "X-Bunq-";
 

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

@@ -6,6 +6,7 @@
 import com.bunq.sdk.model.core.Installation;
 import com.bunq.sdk.model.core.MonetaryAccountReference;
 import com.bunq.sdk.model.core.SessionServer;
+import com.bunq.sdk.model.generated.endpoint.BunqMeTabResultInquiry;
 import com.bunq.sdk.model.generated.object.Geolocation;
 import com.google.gson.GsonBuilder;
 import java.math.BigDecimal;
@@ -35,6 +36,7 @@ public static GsonBuilder buildDefault() {
         )
         .registerTypeAdapter(InstallationContext.class, new InstallationContextAdapter())
         .registerTypeAdapter(Pagination.class, new PaginationAdapter())
+        .registerTypeAdapter(BunqMeTabResultInquiry.class, new BunqMeTabResultInquiryDeserializer())
         .registerTypeHierarchyAdapter(AnchorObjectInterface.class, new AnchorObjectAdapter());
   }
 

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

@@ -0,0 +1,33 @@
+package com.bunq.sdk.json;
+
+import com.bunq.sdk.model.generated.endpoint.BunqMeTabResultInquiry;
+import com.bunq.sdk.model.generated.endpoint.Payment;
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+
+public class BunqMeTabResultInquiryDeserializer implements JsonDeserializer<BunqMeTabResultInquiry> {
+    /**
+     * Field constants.
+     */
+    private static final String FIELD_PAYMENT = "payment";
+
+    /**
+     * Object type constants.
+     */
+    private static final String OBJECT_TYPE_PAYMENT = "Payment";
+
+    @Override
+    public BunqMeTabResultInquiry deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        BunqMeTabResultInquiry tabResultInquiry = new Gson().fromJson(json, BunqMeTabResultInquiry.class);
+
+        JsonObject jsonObject = (JsonObject) json;
+        JsonObject paymentObject = jsonObject.getAsJsonObject(FIELD_PAYMENT);
+        JsonObject wrappedPaymentObject = paymentObject.getAsJsonObject(OBJECT_TYPE_PAYMENT);
+
+        Payment wrappedPayment = new Gson().fromJson(wrappedPaymentObject, Payment.class);
+        tabResultInquiry.setPayment(wrappedPayment);
+
+        return tabResultInquiry;
+    }
+}