Merge 2663f1e into 699ae16

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletAuthenticationToken.java

@@ -13,4 +13,5 @@ public class HyperwalletAuthenticationToken {
     public String getValue() {
         return value;
     }
+
 }

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBankAccountsListPaginationOptions.java

@@ -0,0 +1,36 @@
+package com.hyperwallet.clientsdk.model;
+
+public class HyperwalletBankAccountsListPaginationOptions extends HyperwalletPaginationOptions{
+
+    private HyperwalletBankAccount.Type type;
+    private HyperwalletBankAccount.Status status;
+
+
+    public HyperwalletBankAccount.Type getType() {
+        return type;
+    }
+
+    public void setType(HyperwalletBankAccount.Type type) {
+        this.type = type;
+    }
+
+    public HyperwalletBankAccountsListPaginationOptions type(HyperwalletBankAccount.Type type) {
+        this.type = type;
+        return this;
+    }
+
+
+    public HyperwalletBankAccount.Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(HyperwalletBankAccount.Status status) {
+        this.status = status;
+    }
+
+    public HyperwalletBankAccountsListPaginationOptions status(HyperwalletBankAccount.Status status) {
+        this.status = status;
+        return this;
+    }
+
+}

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBankCard.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hyperwallet.clientsdk.util.HyperwalletJsonConfiguration;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletListPaginationOptions.java

@@ -0,0 +1,20 @@
+package com.hyperwallet.clientsdk.model;
+
+public class HyperwalletListPaginationOptions extends HyperwalletPaginationOptions{
+
+    private HyperwalletTransferMethod.Status status;
+
+    public HyperwalletTransferMethod.Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(HyperwalletTransferMethod.Status status) {
+        this.status = status;
+    }
+
+    public HyperwalletListPaginationOptions status(HyperwalletTransferMethod.Status status) {
+        this.status = status;
+        return this;
+    }
+
+}

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentListOptions.java

@@ -4,32 +4,18 @@
 
 public class HyperwalletPaymentListOptions extends HyperwalletPaginationOptions {
 
-    private Date releasedOn;
-    private String currency;
+    private String clientPaymentId;
 
-    public Date getReleasedOn() {
-        return releasedOn;
+    public String getClientPaymentId() {
+        return clientPaymentId;
     }
 
-    public void setReleasedOn(Date releasedOn) {
-        this.releasedOn = releasedOn;
+    public void setClientPaymentId(String clientPaymentId) {
+        this.clientPaymentId = clientPaymentId;
     }
 
-    public HyperwalletPaymentListOptions releasedOn(Date releasedOn) {
-        this.releasedOn = releasedOn;
-        return this;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public HyperwalletPaymentListOptions currency(String currency) {
-        this.currency = currency;
+    public HyperwalletPaymentListOptions clientPaymentId(String clientPaymentId) {
+        this.clientPaymentId = clientPaymentId;
         return this;
     }
 }

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletStatusTransitionListPaginationOptions.java

@@ -0,0 +1,22 @@
+package com.hyperwallet.clientsdk.model;
+
+import com.hyperwallet.clientsdk.model.HyperwalletStatusTransition.Status;
+
+public class HyperwalletStatusTransitionListPaginationOptions extends HyperwalletPaginationOptions {
+
+    private HyperwalletStatusTransition.Status transition;
+
+    public Status getTransition() {
+        return transition;
+    }
+
+    public void setTransition(Status transition) {
+        this.transition = transition;
+    }
+
+    public HyperwalletStatusTransitionListPaginationOptions transition(HyperwalletStatusTransition.Status transition) {
+        this.transition = transition;
+        return this;
+    }
+
+}

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferListOptions.java

@@ -2,9 +2,23 @@
 
 public class HyperwalletTransferListOptions extends HyperwalletPaginationOptions {
 
+    private String clientTransferId;
     private String sourceToken;
     private String destinationToken;
 
+    public String getClientTransferId() {
+        return clientTransferId;
+    }
+
+    public void setClientTransferId(String clientTransferId) {
+        this.clientTransferId = clientTransferId;
+    }
+
+    public HyperwalletTransferListOptions clientTransferId(String clientTransferId) {
+        this.clientTransferId = clientTransferId;
+        return this;
+    }
+
     public String getSourceToken() {
         return sourceToken;
     }

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletUsersListPaginationOptions.java

@@ -0,0 +1,80 @@
+package com.hyperwallet.clientsdk.model;
+
+import java.util.Date;
+
+public class HyperwalletUsersListPaginationOptions extends HyperwalletPaginationOptions{
+
+    private String clientUserId;
+    private String email;
+    private String programToken;
+    private HyperwalletUser.Status status;
+    private HyperwalletUser.VerificationStatus verificationStatus;
+
+    public String getClientUserId() {
+        return clientUserId;
+    }
+
+    public void setClientUserId(String clientUserId) {
+        this.clientUserId = clientUserId;
+    }
+
+    public HyperwalletUsersListPaginationOptions clientUserId(String clientUserId) {
+        this.clientUserId = clientUserId;
+        return this;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public HyperwalletUsersListPaginationOptions email(String email) {
+        this.email = email;
+        return this;
+    }
+
+    public String getProgramToken() {
+        return programToken;
+    }
+
+    public void setProgramToken(String programToken) {
+        this.programToken = programToken;
+    }
+
+
+    public HyperwalletUsersListPaginationOptions programToken(String programToken) {
+        this.programToken = programToken;
+        return this;
+    }
+
+    public HyperwalletUser.Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(HyperwalletUser.Status status) {
+        this.status = status;
+    }
+
+    public HyperwalletUsersListPaginationOptions status(HyperwalletUser.Status status) {
+        this.status = status;
+        return this;
+    }
+    public HyperwalletUser.VerificationStatus getVerificationStatus() {
+        return verificationStatus;
+    }
+
+    public void setVerificationStatus(HyperwalletUser.VerificationStatus verificationStatus) {
+        this.verificationStatus = verificationStatus;
+    }
+
+    public HyperwalletUsersListPaginationOptions verificationStatus(HyperwalletUser.VerificationStatus verificationStatus) {
+        this.verificationStatus = verificationStatus;
+        return this;
+    }
+
+
+
+}

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletVerificationDocument.java

@@ -1,32 +1,27 @@
 package com.hyperwallet.clientsdk.model;
 
+import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.hyperwallet.clientsdk.util.HyperwalletJsonConfiguration;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
-@JsonInclude(Include.NON_NULL)
+@JsonFilter(HyperwalletJsonConfiguration.INCLUSION_FILTER)
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class
 HyperwalletVerificationDocument {
 
     private String category;
-    private String type;
-    private String status;
-    private String country;
 
-    public HyperwalletVerificationDocument() {
+    private String type;
 
-    }
+    private String status;
 
-    public HyperwalletVerificationDocument(String category, String type, String status) {
-        this.category = category;
-        this.type = type;
-        this.status = status;
-    }
+    private String country;
 
     public String getCategory() {
         return category;

src/main/java/com/hyperwallet/clientsdk/model/HyperwalletWebhookNotificationPaginationOptions.java

@@ -3,6 +3,7 @@
 public class HyperwalletWebhookNotificationPaginationOptions extends HyperwalletPaginationOptions {
 
     private String type;
+    private String programToken;
 
     public String getType() {
         return type;
@@ -12,8 +13,21 @@ public void setType(String type) {
         this.type = type;
     }
 
+    public String getProgramToken() {
+        return programToken;
+    }
+
+    public void setProgramToken(String programToken) {
+        this.programToken = programToken;
+    }
+
     public HyperwalletWebhookNotificationPaginationOptions type(String type) {
         this.type = type;
         return this;
     }
+
+    public HyperwalletWebhookNotificationPaginationOptions programToken(String programToken) {
+        this.programToken = programToken;
+        return this;
+    }
 }

src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java

@@ -69,7 +69,9 @@ public <T> T get(final String url, final Class<T> type) {
     public <T> T get(final String url, final TypeReference<T> type) {
         Response response = null;
         try {
-            response = getService(url, true).getResource();
+            Request req = getService(url, true);
+            response = req.getResource();
+            //response = getService(url, true).getResource();
             return processResponse(response, type);
         } catch (IOException | JOSEException | ParseException e) {
             throw new HyperwalletException(e);