Change some more remaining Integer to Long

Author: Deniz Yildirim

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/ApiClient.java

@@ -65,7 +65,7 @@ public class ApiClient {
     /**
      * Response code to use in case the response code is null due to unforeseen circumstances.
      */
-    private static final int DUMMY_RESPONSE_CODE = 0;
+    private static final long DUMMY_RESPONSE_CODE = 0;
 
     /**
      * Private variables.
@@ -272,7 +272,7 @@ private String generateSignature(BunqRequestBuilder requestBuilder) {
      */
     private BunqResponseRaw createBunqResponseRaw(Response response)
             throws IOException {
-        int responseCode = response.code();
+        long responseCode = response.code();
         byte[] responseBodyBytes = Objects.requireNonNull(response.body()).bytes();
 
         assertResponseSuccess(responseCode, responseBodyBytes, getResponseId(response));
@@ -293,7 +293,7 @@ private static String getResponseId(Response response) {
     /**
      *
      */
-    private static void assertResponseSuccess(Integer responseCode, byte[] responseBodyBytes, String responseId) {
+    private static void assertResponseSuccess(Long responseCode, byte[] responseBodyBytes, String responseId) {
         if (responseCode == null) {
             responseCode = DUMMY_RESPONSE_CODE;
         }
@@ -307,7 +307,7 @@ private static void assertResponseSuccess(Integer responseCode, byte[] responseB
      *
      */
     private static ApiException createApiExceptionRequestUnsuccessful(
-            Integer responseCode,
+            Long responseCode,
             String responseBody,
             String responseId
     ) {
@@ -359,7 +359,7 @@ private static List<String> fetchAllErrorDescription(JsonObject responseBodyJson
      *
      */
     private void validateResponseSignature(
-            int responseCode,
+            long responseCode,
             byte[] responseBodyBytes,
             Response response
     ) {

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.
@@ -47,7 +47,7 @@ private void assertHasNextPage() {
         }
     }
 
-    private Integer getNextId() {
+    private Long getNextId() {
         if (hasNextPageAssured()) {
             return newerId;
         } else {
@@ -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/model/core/BunqModel.java

@@ -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/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

@@ -32,7 +32,7 @@ public class UserContextHelper extends BunqModel {
     /**
      * The index of the first item in an array.
      */
-    private static final Integer INDEX_FIRST = 0;
+    private static final Long INDEX_FIRST = 0;
 
     /**
      * Status constants.
@@ -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)
         );

src/test/java/com/bunq/sdk/Config.java

@@ -77,8 +77,8 @@ public static String[] getPermittedIps() {
         }
     }
 
-    public static Integer getUserId() {
-        return Integer.parseInt(properties.getProperty(FIELD_USER_ID));
+    public static Long getUserId() {
+        return Long.parseLong(properties.getProperty(FIELD_USER_ID));
     }
 
     public static String getContentType() {
@@ -93,12 +93,12 @@ public static String getPathAttachmentIn() {
         return properties.getProperty(FIELD_PATH_ATTACHMENT_IN);
     }
 
-    public static Integer getMonetaryAccountId() {
-        return Integer.parseInt(properties.getProperty(FIELD_MONETARY_ACCOUNT_ID));
+    public static Long getMonetaryAccountId() {
+        return Long.parseLong(properties.getProperty(FIELD_MONETARY_ACCOUNT_ID));
     }
 
-    public static Integer getMonetaryAccountId2() {
-        return Integer.parseInt(properties.getProperty(FIELD_MONETARY_ACCOUNT_ID2));
+    public static Long getMonetaryAccountId2() {
+        return Long.parseLong(properties.getProperty(FIELD_MONETARY_ACCOUNT_ID2));
     }
 
     public static PointerObject getCounterPartyAliasOther() {
@@ -115,7 +115,7 @@ public static PointerObject getCounterPartyAliasSelf() {
         return new PointerObject(type, value);
     }
 
-    public static Integer getPaymentIdWithGeolocation() {
-        return Integer.parseInt(properties.getProperty(FIELD_PAYMENT_ID_WITH_GEOLOCATION));
+    public static Long getPaymentIdWithGeolocation() {
+        return Long.parseLong(properties.getProperty(FIELD_PAYMENT_ID_WITH_GEOLOCATION));
     }
 }

src/test/java/com/bunq/sdk/context/Psd2ContextTest.java

@@ -86,7 +86,7 @@ public void testCreateOauthClient() {
         }
 
         try {
-            Integer clientId = OauthClientApiObject.create().getValue();
+            Long clientId = OauthClientApiObject.create().getValue();
             OauthClientApiObject oauthClient = OauthClientApiObject.get(clientId).getValue();
 
             Assert.assertNotNull(oauthClient);