From 48d5dde5f3df034f1c34150daa65e98140530432 Mon Sep 17 00:00:00 2001 From: Farsene1 <33878402+Farsene1@users.noreply.github.com> Date: Tue, 12 May 2020 16:20:58 +0200 Subject: [PATCH 1/2] Update SessionContext.java --- .../com/bunq/sdk/context/SessionContext.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/com/bunq/sdk/context/SessionContext.java b/src/main/java/com/bunq/sdk/context/SessionContext.java index 3e28ca07..a391a1ac 100644 --- a/src/main/java/com/bunq/sdk/context/SessionContext.java +++ b/src/main/java/com/bunq/sdk/context/SessionContext.java @@ -55,21 +55,7 @@ public class SessionContext implements java.io.Serializable { } private int getUserId(BunqModel user) { - if (user instanceof UserPerson) { - return ((UserPerson) user).getId(); - } else if (user instanceof UserCompany) { - return ((UserCompany) user).getId(); - } else if (user instanceof UserApiKey) { - return ((UserApiKey) user).getId(); - } else if (user instanceof UserPaymentServiceProvider) { - return ((UserPaymentServiceProvider) user).getId(); - } else { - throw new BunqException( - String.format( - ERROR_UNEXPECTED_USER_TYPE, user.getClass().toString() - ) - ); - } + return user.getId(); } private static Date calculateExpiryTime(SessionServer sessionServer) { From 08c3719694443516f7f6034bdaacb1efee33d4ff Mon Sep 17 00:00:00 2001 From: Farsene1 <33878402+Farsene1@users.noreply.github.com> Date: Tue, 12 May 2020 16:22:28 +0200 Subject: [PATCH 2/2] Update BunqModel.java --- src/main/java/com/bunq/sdk/model/core/BunqModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/bunq/sdk/model/core/BunqModel.java b/src/main/java/com/bunq/sdk/model/core/BunqModel.java index 8d7eb076..b61aab14 100644 --- a/src/main/java/com/bunq/sdk/model/core/BunqModel.java +++ b/src/main/java/com/bunq/sdk/model/core/BunqModel.java @@ -196,5 +196,7 @@ protected static byte[] determineAllRequestByte(HashMap requestM return requestString.replaceAll(REGEX_FIELD_FOR_REQUEST, STRING_EMPTY).getBytes(); } + + abstract public Integer getId(); }