Merge pull request #159 from denizy97/develop

use long data type for model id

Author: andrederoos

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

@@ -44,7 +44,7 @@ public class SessionContext implements java.io.Serializable {
 
     @Expose
     @SerializedName("user_id")
-    private final Integer userId;
+    private final Long userId;
 
     @Expose
     @SerializedName("user_person")
@@ -129,7 +129,7 @@ Date getExpiryTime() {
         return expiryTime;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 

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

@@ -52,7 +52,7 @@ public void refreshContext() {
         this.initMainMonetaryAccount(helper);
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return this.apiContext.getSessionContext().getUserId();
     }
 
@@ -72,7 +72,7 @@ public boolean areAllUserSet() {
         return this.userPerson != null && this.userCompany != null && this.userApiKey != null;
     }
 
-    public Integer getMainMonetaryAccountId() {
+    public Long getMainMonetaryAccountId() {
         if (this.primaryMonetaryAccountBank == null) {
             throw new BunqException(ERROR_PRIMARY_MONETARY_ACCOUNT_IS_NOT_SET);
         } else {

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

@@ -23,10 +23,10 @@ public class Pagination {
     public static final String PARAM_FUTURE_ID = "future_id";
     public static final String PARAM_COUNT = "count";
 
-    private Integer olderId;
-    private Integer newerId;
-    private Integer futureId;
-    private Integer count;
+    private Long olderId;
+    private Long newerId;
+    private Long futureId;
+    private Long count;
 
     /**
      * Get the URL params required to request the next page of the listing.
@@ -35,7 +35,7 @@ public Map<String, String> getUrlParamsNextPage() {
         assertHasNextPage();
 
         Map<String, String> params = new HashMap<>();
-        params.put(PARAM_NEWER_ID, Integer.toString(getNextId()));
+        params.put(PARAM_NEWER_ID, Long.toString(getNextId()));
         addCountToParamsIfNeeded(params);
 
         return params;
@@ -47,7 +47,7 @@ private void assertHasNextPage() {
         }
     }
 
-    private Integer getNextId() {
+    private Long getNextId() {
         if (hasNextPageAssured()) {
             return newerId;
         } else {
@@ -61,7 +61,7 @@ public boolean hasNextPageAssured() {
 
     private void addCountToParamsIfNeeded(Map<String, String> params) {
         if (count != null) {
-            params.put(PARAM_COUNT, Integer.toString(count));
+            params.put(PARAM_COUNT, Long.toString(count));
         }
     }
 
@@ -72,7 +72,7 @@ public Map<String, String> getUrlParamsPreviousPage() {
         assertHasPreviousPage();
 
         Map<String, String> params = new HashMap<>();
-        params.put(PARAM_OLDER_ID, Integer.toString(olderId));
+        params.put(PARAM_OLDER_ID, Long.toString(olderId));
         addCountToParamsIfNeeded(params);
 
         return params;
@@ -98,35 +98,35 @@ public Map<String, String> getUrlParamsCountOnly() {
         return params;
     }
 
-    public Integer getOlderId() {
+    public Long getOlderId() {
         return olderId;
     }
 
-    public void setOlderId(Integer olderId) {
+    public void setOlderId(Long olderId) {
         this.olderId = olderId;
     }
 
-    public Integer getNewerId() {
+    public Long getNewerId() {
         return newerId;
     }
 
-    public void setNewerId(Integer newerId) {
+    public void setNewerId(Long newerId) {
         this.newerId = newerId;
     }
 
-    public Integer getFutureId() {
+    public Long getFutureId() {
         return futureId;
     }
 
-    public void setFutureId(Integer futureId) {
+    public void setFutureId(Long futureId) {
         this.futureId = futureId;
     }
 
-    public Integer getCount() {
+    public Long getCount() {
         return count;
     }
 
-    public void setCount(Integer count) {
+    public void setCount(Long count) {
         this.count = count;
     }
 }

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

@@ -29,17 +29,17 @@ public Pagination deserialize(JsonElement json, Type typeOfT,
                                   JsonDeserializationContext context) throws JsonParseException {
         try {
             JsonObject responseJson = json.getAsJsonObject();
-            Map<String, Integer> paginationBody = parsePaginationBody(responseJson);
+            Map<String, Long> paginationBody = parsePaginationBody(responseJson);
 
             return createPagination(paginationBody);
         } catch (URISyntaxException exception) {
             throw new JsonParseException(exception);
         }
     }
 
-    private Map<String, Integer> parsePaginationBody(JsonObject responseJson)
+    private Map<String, Long> parsePaginationBody(JsonObject responseJson)
             throws URISyntaxException {
-        Map<String, Integer> paginationBody = new HashMap<>();
+        Map<String, Long> paginationBody = new HashMap<>();
         updatePaginationBodyFromResponseField(
                 paginationBody,
                 Pagination.PARAM_OLDER_ID,
@@ -65,7 +65,7 @@ private Map<String, Integer> parsePaginationBody(JsonObject responseJson)
         return paginationBody;
     }
 
-    private Pagination createPagination(Map<String, Integer> paginationBody) {
+    private Pagination createPagination(Map<String, Long> paginationBody) {
         Pagination pagination = new Pagination();
         pagination.setOlderId(paginationBody.get(Pagination.PARAM_OLDER_ID));
         pagination.setNewerId(paginationBody.get(Pagination.PARAM_NEWER_ID));
@@ -76,7 +76,7 @@ private Pagination createPagination(Map<String, Integer> paginationBody) {
     }
 
     private void updatePaginationBodyFromResponseField(
-            Map<String, Integer> paginationBody,
+            Map<String, Long> paginationBody,
             String idField,
             JsonObject responseJson,
             String responseField,
@@ -89,10 +89,10 @@ private void updatePaginationBodyFromResponseField(
 
             for (String parameterName : Objects.requireNonNull(url).queryParameterNames()) {
                 if (responseParam.equals(parameterName)) {
-                    paginationBody.put(idField, Integer.parseInt(Objects.requireNonNull(url.queryParameter(parameterName))));
+                    paginationBody.put(idField, Long.parseLong(Objects.requireNonNull(url.queryParameter(parameterName))));
                 } else if (Pagination.PARAM_COUNT.equals(parameterName) &&
                         paginationBody.get(Pagination.PARAM_COUNT) == null) {
-                    paginationBody.put(Pagination.PARAM_COUNT, Integer.parseInt(Objects.requireNonNull(url.queryParameter(parameterName))));
+                    paginationBody.put(Pagination.PARAM_COUNT, Long.parseLong(Objects.requireNonNull(url.queryParameter(parameterName))));
                 }
             }
         }

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

@@ -75,10 +75,10 @@ static <T> BunqResponse<T> fromJsonArrayNested(Class<T> classOfObject,
     /**
      * De-serializes an ID object and returns its integer value.
      */
-    protected static BunqResponse<Integer> processForId(BunqResponseRaw responseRaw) {
+    protected static BunqResponse<Long> processForId(BunqResponseRaw responseRaw) {
         JsonObject responseItemObject = getResponseItemObject(responseRaw);
         JsonObject responseItemObjectUnwrapped = getWrappedContent(responseItemObject, FIELD_ID);
-        Integer responseValue = gson.fromJson(responseItemObjectUnwrapped, Id.class).getId();
+        Long responseValue = gson.fromJson(responseItemObjectUnwrapped, Id.class).getId();
 
         return new BunqResponse<>(responseValue, responseRaw.getHeaders());
     }
@@ -195,11 +195,11 @@ protected static ApiContext getApiContext() {
         return BunqContext.getApiContext();
     }
 
-    protected static Integer determineUserId() {
+    protected static Long determineUserId() {
         return BunqContext.getUserContext().getUserId();
     }
 
-    protected static Integer determineMonetaryAccountId(Integer id) {
+    protected static Long determineMonetaryAccountId(Long id) {
         if (id == null) {
             return BunqContext.getUserContext().getPrimaryMonetaryAccountBank().getId();
         } else {

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

@@ -10,7 +10,7 @@
 import java.util.List;
 
 public class DeviceServerInternal extends DeviceServerApiObject {
-    public static BunqResponse<Integer> create(
+    public static BunqResponse<Long> create(
             ApiContext apiContext,
             String description,
             String secret,

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

@@ -2,12 +2,12 @@
 
 public class Id {
 
-    private Integer id;
+    private Long id;
 
     public Id() {
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 }

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

@@ -59,7 +59,7 @@ private static byte[] generateRequestBodyBytes(String publicKeyClientString) {
         return gson.toJson(installationRequestBody).getBytes();
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id.getId();
     }
 

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

@@ -28,7 +28,7 @@ public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResp
      * Create notification filters with list response type.
      */
     public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse(
-            Integer monetaryAccountId,
+            Long monetaryAccountId,
             List<NotificationFilterUrlObject> allNotificationFilter
     ) {
         return createWithListResponse(monetaryAccountId, allNotificationFilter, null);
@@ -38,7 +38,7 @@ public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResp
      * Create notification filters with list response type.
      */
     public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse(
-            Integer monetaryAccountId,
+            Long monetaryAccountId,
             List<NotificationFilterUrlObject> allNotificationFilter,
             Map<String, String> customHeaders
     ) {

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

@@ -56,7 +56,7 @@ public UserApiObject getFirstUser() {
         return response.getValue().get(INDEX_FIRST);
     }
 
-    public MonetaryAccountBankApiObject getFirstActiveMonetaryAccountBankByUserId(Integer userId) {
+    public MonetaryAccountBankApiObject getFirstActiveMonetaryAccountBankByUserId(Long userId) {
         BunqResponseRaw responseRaw = getRawResponse(
                 String.format(ENDPOINT_MONETARY_ACCOUNT_BANK, userId)
         );