Feature/improve decoder bunq/sdk java#35

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

@@ -0,0 +1,47 @@
+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.*;
+
+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/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,13 @@ 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 +155,8 @@ public String toString() {
     return gson.toJson(this);
   }
 
+  /**
+   */
+  abstract public boolean isAllFieldNull();
+
 }

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

@@ -66,4 +66,20 @@ public String getPublicKeyServer() {
     return publicKeyServer.getPublicKeyServer();
   }
 
+  @Override
+  public boolean isAllFieldNull() {
+    if (this.id == null) {
+      return false;
+    }
+
+    if (this.sessionToken == null) {
+      return false;
+    }
+
+    if (this.publicKeyServer == null) {
+      return false;
+    }
+
+    return true;
+  }
 }

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

@@ -28,4 +28,16 @@ public LabelMonetaryAccount getLabelMonetaryAccount() {
     return labelMonetaryAccount;
   }
 
+  @Override
+  public boolean isAllFieldNull() {
+    if (this.pointer == null) {
+      return false;
+    }
+
+    if (this.labelMonetaryAccount == null) {
+      return false;
+    }
+
+    return true;
+  }
 }

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

@@ -76,4 +76,24 @@ public UserPerson getUserPerson() {
     return userPerson;
   }
 
+  @Override
+  public boolean isAllFieldNull() {
+    if (this.id == null) {
+      return false;
+    }
+
+    if (this.sessionToken == null) {
+      return false;
+    }
+
+    if (this.userCompany == null) {
+      return false;
+    }
+
+    if (this.userPerson == null) {
+      return false;
+    }
+
+    return true;
+  }
 }

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

@@ -7,6 +7,15 @@ public class SessionToken extends BunqModel {
   protected SessionToken() {
   }
 
+  @Override
+  public boolean isAllFieldNull() {
+    if (this.token == null) {
+      return false;
+    }
+
+    return true;
+  }
+
   public SessionToken(String token) {
     this.token = token;
   }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentConversationContent.java

@@ -8,6 +8,7 @@
 import com.bunq.sdk.model.core.MonetaryAccountReference;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,4 +46,16 @@ public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, I
     return new BunqResponse<>(responseRaw.getBodyBytes(), responseRaw.getHeaders());
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentConversationContent fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentConversationContent.class, reader);
+  }
+
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentMonetaryAccount.java

@@ -9,6 +9,7 @@
 import com.bunq.sdk.model.generated.object.Attachment;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -85,4 +86,24 @@ public void setId(Integer id) {
     this.id = id;
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    if (this.attachment != null) {
+      return false;
+    }
+
+    if (this.id != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentMonetaryAccount fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentMonetaryAccount.class, reader);
+  }
+
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublic.java

@@ -9,6 +9,7 @@
 import com.bunq.sdk.model.generated.object.Attachment;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -137,4 +138,32 @@ public void setAttachment(Attachment attachment) {
     this.attachment = attachment;
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    if (this.uuid != null) {
+      return false;
+    }
+
+    if (this.created != null) {
+      return false;
+    }
+
+    if (this.updated != null) {
+      return false;
+    }
+
+    if (this.attachment != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentPublic fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentPublic.class, reader);
+  }
+
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublicContent.java

@@ -8,6 +8,7 @@
 import com.bunq.sdk.model.core.MonetaryAccountReference;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,4 +46,16 @@ public static BunqResponse<byte[]> list(ApiContext apiContext, String attachment
     return new BunqResponse<>(responseRaw.getBodyBytes(), responseRaw.getHeaders());
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentPublicContent fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentPublicContent.class, reader);
+  }
+
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTab.java

@@ -9,6 +9,7 @@
 import com.bunq.sdk.model.generated.object.Attachment;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -139,4 +140,32 @@ public void setAttachment(Attachment attachment) {
     this.attachment = attachment;
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    if (this.id != null) {
+      return false;
+    }
+
+    if (this.created != null) {
+      return false;
+    }
+
+    if (this.updated != null) {
+      return false;
+    }
+
+    if (this.attachment != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentTab fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentTab.class, reader);
+  }
+
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTabContent.java

@@ -8,6 +8,7 @@
 import com.bunq.sdk.model.core.MonetaryAccountReference;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,4 +46,16 @@ public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, I
     return new BunqResponse<>(responseRaw.getBodyBytes(), responseRaw.getHeaders());
   }
 
+  /**
+   */
+  public boolean isAllFieldNull() {
+    return true;
+  }
+
+  /**
+   */
+  public static AttachmentTabContent fromJsonReader(JsonReader reader) {
+    return fromJsonReader(AttachmentTabContent.class, reader);
+  }
+
 }