Merge pull request #15 from bunq/bunq/tinker_java#11_new_version

Update tinker to new version. (#11)

Author: andrederoos

build.gradle

@@ -14,7 +14,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     // https://mvnrepository.com/artifact/commons-cli/commons-cli
     compile group: 'commons-cli', name: 'commons-cli', version: '1.2'
-    compile 'com.github.bunq:sdk_java:0.13.+'
+    compile 'com.github.bunq:sdk_java:1.10.+'
 }
 
 jar {

src/main/java/com/bunq/tinker/AddCallbackUrl.java

@@ -99,9 +99,7 @@ public void run(String[] args) throws ParseException {
                     null, /* subStatus */
                     null, /* legalGuardianAlias */
                     null, /* sessionTimeout */
-                    null, /* CardIds */
-                    null, /* cardLimits */
-                    null, /* dailyLimitWithoutConfirmationLogin */
+                    null, /* DailyLimitWithoutConfirmationLogin */
                     allNotificationFilterUpdated
             );
         } else if (bunq.getUser().getReferencedObject() instanceof UserCompany) {
@@ -116,6 +114,7 @@ public void run(String[] args) throws ParseException {
                     null, /* country */
                     null, /* ubo */
                     null, /* chamberOfCommerce */
+                    null, /* legalForm */
                     null, /* status */
                     null, /* subStatus */
                     null, /* sessionTimeout */

src/main/java/com/bunq/tinker/LinkCard.java

@@ -2,14 +2,21 @@
 
 import com.bunq.sdk.context.ApiEnvironmentType;
 import com.bunq.sdk.model.generated.endpoint.Card;
+import com.bunq.sdk.model.generated.object.CardPinAssignment;
 import com.bunq.tinker.libs.BunqLib;
 import com.bunq.tinker.libs.SharedLib;
 import com.bunq.tinker.utils.ITinker;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
+import java.util.ArrayList;
 
 public class LinkCard implements ITinker {
 
+    /**
+     * Input constants.
+     */
+    private static final String CARD_PIN_ASSIGNMENT_TYPE_PRIMARY = "PRIMARY";
+
     /**
      * @param args
      *
@@ -18,6 +25,7 @@ public class LinkCard implements ITinker {
     public void run(String[] args) throws ParseException {
         CommandLine allOption = SharedLib.parseAllOption(args);
         ApiEnvironmentType environmentType = SharedLib.determineEnvironmentType(allOption);
+        ArrayList<CardPinAssignment> allCardPinAssignment = new ArrayList<>();
 
         SharedLib.printHeader();
 
@@ -26,6 +34,12 @@ public void run(String[] args) throws ParseException {
         String cardId = SharedLib.determineCardIdFromAllOptionOrStdIn(allOption);
         String accountId = SharedLib.determineAccountIdFromAllOptionOrStdIn(allOption);
 
+        allCardPinAssignment.add(new CardPinAssignment(
+            CARD_PIN_ASSIGNMENT_TYPE_PRIMARY,
+            null, /* pinCode */
+            Integer.parseInt(accountId))
+        );
+
         System.out.println();
         System.out.println("  | Link Card:    " + cardId);
         System.out.println("  | To Account:   " + accountId);
@@ -38,10 +52,11 @@ public void run(String[] args) throws ParseException {
                 null, /* pinCode */
                 null, /* activationCode */
                 null, /* status */
-                null, /* limit */
+                null, /* cardLimit */
+                null, /* cardLimitAtm */
                 null, /* magStripePermissions */
                 null, /* countryPermission */
-                Integer.parseInt(accountId)
+                allCardPinAssignment
         );
 
         System.out.println();

src/main/java/com/bunq/tinker/libs/SharedLib.java

@@ -232,7 +232,7 @@ public static void printAllPayment(List<Payment> allPayment) {
     public static void printPayment(Payment payment) {
         String currency = payment.getAmount().getCurrency();
         String value = payment.getAmount().getValue();
-        String counterpartyDisplayName = payment.getCounterpartyAlias().getLabelMonetaryAccount().getDisplayName();
+        String counterpartyDisplayName = payment.getCounterpartyAlias().getLabelUser().getDisplayName();
 
         System.out.println("  ┌───────────────────┬────────────────────────────────────────────────────");
         System.out.println("  │ ID                │ " + payment.getId());
@@ -257,7 +257,7 @@ public static void printAllRequest(List<RequestInquiry> allRequest) {
     public static void printRequest(RequestInquiry request) {
         String currency = request.getAmountInquired().getCurrency();
         String value = request.getAmountInquired().getValue();
-        String counterpartyDisplayName = request.getCounterpartyAlias().getLabelMonetaryAccount().getDisplayName();
+        String counterpartyDisplayName = request.getCounterpartyAlias().getLabelUser().getDisplayName();
 
         System.out.println("  ┌───────────────────┬────────────────────────────────────────────────────");
         System.out.println("  │ ID                │ " + request.getId());
@@ -283,10 +283,10 @@ public static void printAllCard(List<Card> allCard, List<MonetaryAccountBank> al
 
     public static void printCard(Card card, List<MonetaryAccountBank> allMonetaryAccountBank) {
         MonetaryAccountBank monetaryAccountBank = BunqLib.getMonetaryAccountBankFromLabel(
-                card.getLabelMonetaryAccountCurrent().getLabelMonetaryAccount(),
+                card.getLabelMonetaryAccountCurrent(),
                 allMonetaryAccountBank
         );
-        String iban = card.getLabelMonetaryAccountCurrent().getPointer().getValue();
+        String iban = card.getLabelMonetaryAccountCurrent().getIban();
         String cardDescription = card.getSecondLine() == null ? "bunq card" : card.getSecondLine();
         String monetaryAccountDescription =
                 monetaryAccountBank == null ? "account description" : monetaryAccountBank.getDescription();