Minor fixes for Marketpay

src/main/java/com/adyen/Client.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############

src/main/java/com/adyen/Config.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############

src/main/java/com/adyen/model/AbstractPaymentRequest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############

src/main/java/com/adyen/model/PaymentRequest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############

src/main/java/com/adyen/model/additionalData/InvoiceLine.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############

src/main/java/com/adyen/model/additionalData/SplitPayment.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -22,9 +22,6 @@
 
 import java.util.List;
 
-/**
- * Created by rikt on 9/13/17.
- */
 public class SplitPayment {
 
     private Integer api;

src/main/java/com/adyen/model/additionalData/SplitPaymentItem.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -20,9 +20,6 @@
  */
 package com.adyen.model.additionalData;
 
-/**
- * Created by rikt on 9/13/17.
- */
 public class SplitPaymentItem {
 
     private Long amount;

src/main/java/com/adyen/model/marketpay/AccountContainer.java

@@ -18,7 +18,6 @@
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
-
 package com.adyen.model.marketpay;
 
 import java.util.Objects;
@@ -31,6 +30,10 @@ public class AccountContainer {
     @SerializedName("Account")
     private Account account = null;
 
+    public AccountContainer(Account account) {
+        this.account = account;
+    }
+
     /**
      * account
      *

src/main/java/com/adyen/model/marketpay/AccountDetailBalanceContainer.java

@@ -18,7 +18,6 @@
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
-
 package com.adyen.model.marketpay;
 
 import java.util.Objects;
@@ -31,6 +30,10 @@ public class AccountDetailBalanceContainer {
     @SerializedName("AccountDetailBalance")
     private AccountDetailBalance accountDetailBalance = null;
 
+    public AccountDetailBalanceContainer(AccountDetailBalance accountDetailBalance) {
+        this.accountDetailBalance = accountDetailBalance;
+    }
+
     /**
      * accountDetailBalance
      *

src/main/java/com/adyen/model/marketpay/AccountHolderBalanceResponse.java

@@ -133,13 +133,13 @@ public void setBalancePerAccount(List<AccountDetailBalance> balancePerAccount) {
 
         for (AccountDetailBalance accountDetailBalance : balancePerAccount) {
 
-            AccountDetailBalanceContainer accountDetailBalanceContainer = createAccountDetailBalanceContainerFromAccountDetailBalance(accountDetailBalance);
+            AccountDetailBalanceContainer accountDetailBalanceContainer = new AccountDetailBalanceContainer(accountDetailBalance);
             this.balancePerAccountContainers.add(accountDetailBalanceContainer);
         }
     }
 
     public AccountHolderBalanceResponse addBalancePerAccount(AccountDetailBalance accountDetailBalance) {
-        AccountDetailBalanceContainer accountDetailBalanceContainer = createAccountDetailBalanceContainerFromAccountDetailBalance(accountDetailBalance);
+        AccountDetailBalanceContainer accountDetailBalanceContainer = new AccountDetailBalanceContainer(accountDetailBalance);
 
         if (balancePerAccountContainers == null) {
             balancePerAccountContainers = new ArrayList<AccountDetailBalanceContainer>();
@@ -154,12 +154,6 @@ public AccountHolderBalanceResponse addBalancePerAccount(AccountDetailBalance ac
         return this;
     }
 
-    private AccountDetailBalanceContainer createAccountDetailBalanceContainerFromAccountDetailBalance(AccountDetailBalance accountDetailBalance) {
-        AccountDetailBalanceContainer accountDetailBalanceContainer = new AccountDetailBalanceContainer();
-        accountDetailBalanceContainer.setAccountDetailBalance(accountDetailBalance);
-        return accountDetailBalanceContainer;
-    }
-
     public AccountHolderBalanceResponse pspReference(String pspReference) {
         this.pspReference = pspReference;
         return this;

src/main/java/com/adyen/model/marketpay/AccountHolderDetails.java

@@ -143,18 +143,14 @@ public List<BankAccountDetail> getBankAccountDetails() {
 
     /**
      * Creating a new bankAccountDetails list
-     *
-     * @param bankAccountDetails
      */
     public void setBankAccountDetails(List<BankAccountDetail> bankAccountDetails) {
-
         this.bankAccountDetails = bankAccountDetails;
 
         // set as well the container list this will be send in the API request
         this.bankAccountDetailContainers = new ArrayList<BankAccountDetailContainer>();
         for (BankAccountDetail bankAccountDetail : bankAccountDetails) {
-
-            BankAccountDetailContainer bankAccountDetailContainer = createBankAccountDetailContainerFromBankAccountDetail(bankAccountDetail);
+            BankAccountDetailContainer bankAccountDetailContainer = new BankAccountDetailContainer(bankAccountDetail);
             this.bankAccountDetailContainers.add(bankAccountDetailContainer);
         }
     }
@@ -166,7 +162,7 @@ public void setBankAccountDetails(List<BankAccountDetail> bankAccountDetails) {
      * @return
      */
     public AccountHolderDetails addBankAccountDetail(BankAccountDetail bankAccountDetail) {
-        BankAccountDetailContainer bankAccountDetailContainer = createBankAccountDetailContainerFromBankAccountDetail(bankAccountDetail);
+        BankAccountDetailContainer bankAccountDetailContainer = new BankAccountDetailContainer(bankAccountDetail);
 
         if (bankAccountDetailContainers == null) {
             bankAccountDetailContainers = new ArrayList<BankAccountDetailContainer>();
@@ -181,14 +177,6 @@ public AccountHolderDetails addBankAccountDetail(BankAccountDetail bankAccountDe
         return this;
     }
 
-
-    private BankAccountDetailContainer createBankAccountDetailContainerFromBankAccountDetail(BankAccountDetail bankAccountDetail) {
-        BankAccountDetailContainer bankAccountDetailContainer = new BankAccountDetailContainer();
-        bankAccountDetailContainer.setBankAccountDetail(bankAccountDetail);
-        return bankAccountDetailContainer;
-    }
-
-
     public AccountHolderDetails individualDetails(IndividualDetails individualDetails) {
         this.individualDetails = individualDetails;
         return this;

src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListResponse.java

@@ -101,14 +101,14 @@ public void setAccountTransactionLists(List<AccountTransactionList> accountTrans
 
         for (AccountTransactionList accountTransactionList : accountTransactionLists) {
 
-            AccountTransactionListContainer accountTransactionListContainer = createAccountTransactionListContainerFromAccountTransactionList(accountTransactionList);
+            AccountTransactionListContainer accountTransactionListContainer = new AccountTransactionListContainer(accountTransactionList);
             this.accountTransactionListContainers.add(accountTransactionListContainer);
         }
 
     }
 
     public AccountHolderTransactionListResponse addAccountTransactionList(AccountTransactionList accountTransactionList) {
-        AccountTransactionListContainer accountTransactionListContainer = createAccountTransactionListContainerFromAccountTransactionList(accountTransactionList);
+        AccountTransactionListContainer accountTransactionListContainer = new AccountTransactionListContainer(accountTransactionList);
 
         if (accountTransactionListContainers == null) {
             accountTransactionListContainers = new ArrayList<AccountTransactionListContainer>();
@@ -123,13 +123,6 @@ public AccountHolderTransactionListResponse addAccountTransactionList(AccountTra
         return this;
     }
 
-    private AccountTransactionListContainer createAccountTransactionListContainerFromAccountTransactionList(AccountTransactionList accountTransactionList) {
-        AccountTransactionListContainer accountTransactionListContainer = new AccountTransactionListContainer();
-        accountTransactionListContainer.setAccountTransactionList(accountTransactionList);
-        return accountTransactionListContainer;
-    }
-
-
     public AccountHolderTransactionListResponse resultCode(String resultCode) {
         this.resultCode = resultCode;
         return this;

src/main/java/com/adyen/model/marketpay/AccountTransactionList.java

@@ -117,13 +117,13 @@ public void setTransactions(List<Transaction> transactions) {
 
         for (Transaction transaction : transactions) {
 
-            TransactionContainer transactionContainer = createTransactionContainerFromTransaction(transaction);
+            TransactionContainer transactionContainer = new TransactionContainer(transaction);
             this.transactionContainers.add(transactionContainer);
         }
     }
 
     public AccountTransactionList addTransaction(Transaction transaction) {
-        TransactionContainer transactionContainer = createTransactionContainerFromTransaction(transaction);
+        TransactionContainer transactionContainer = new TransactionContainer(transaction);
 
         if (transactionContainers == null) {
             transactionContainers = new ArrayList<TransactionContainer>();
@@ -136,13 +136,6 @@ public AccountTransactionList addTransaction(Transaction transaction) {
         return this;
     }
 
-    private TransactionContainer createTransactionContainerFromTransaction(Transaction transaction) {
-        TransactionContainer transactionContainer = new TransactionContainer();
-        transactionContainer.setTransaction(transaction);
-        return transactionContainer;
-    }
-
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/main/java/com/adyen/model/marketpay/AccountTransactionListContainer.java

@@ -31,6 +31,10 @@ public class AccountTransactionListContainer {
     @SerializedName("AccountTransactionList")
     private AccountTransactionList accountTransactionList = null;
 
+    public AccountTransactionListContainer(AccountTransactionList accountTransactionList) {
+        this.accountTransactionList = accountTransactionList;
+    }
+
     /**
      * accountTransactionList
      *

src/main/java/com/adyen/model/marketpay/BankAccountDetailContainer.java

@@ -32,6 +32,10 @@ public class BankAccountDetailContainer {
     @SerializedName("BankAccountDetail")
     private BankAccountDetail bankAccountDetail = null;
 
+    public BankAccountDetailContainer(BankAccountDetail bankAccountDetail) {
+        this.bankAccountDetail = bankAccountDetail;
+    }
+
     /**
      * bankAccountDetail
      *
@@ -62,7 +66,6 @@ public int hashCode() {
         return Objects.hash(bankAccountDetail);
     }
 
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

src/main/java/com/adyen/model/marketpay/BusinessDetails.java

@@ -74,7 +74,7 @@ public void setShareholders(List<ShareholderContact> shareholders) {
         this.shareholderContactContainers = new ArrayList<ShareholderContactContainer>();
         for (ShareholderContact shareholderContact : shareholders) {
 
-            ShareholderContactContainer shareholderContactContainer = createShareholderContactContainerFromShareHolderContact(shareholderContact);
+            ShareholderContactContainer shareholderContactContainer = new ShareholderContactContainer(shareholderContact);
             this.shareholderContactContainers.add(shareholderContactContainer);
         }
     }
@@ -86,7 +86,7 @@ public void setShareholders(List<ShareholderContact> shareholders) {
      * @return
      */
     public BusinessDetails addShareholderContact(ShareholderContact shareholderContact) {
-        ShareholderContactContainer shareholderContactContainer = createShareholderContactContainerFromShareHolderContact(shareholderContact);
+        ShareholderContactContainer shareholderContactContainer = new ShareholderContactContainer(shareholderContact);
 
         if (shareholderContactContainers == null) {
             shareholderContactContainers = new ArrayList<ShareholderContactContainer>();
@@ -101,12 +101,6 @@ public BusinessDetails addShareholderContact(ShareholderContact shareholderConta
         return this;
     }
 
-    private ShareholderContactContainer createShareholderContactContainerFromShareHolderContact(ShareholderContact shareholderContact) {
-        ShareholderContactContainer shareholderContactContainer = new ShareholderContactContainer();
-        shareholderContactContainer.setShareholderContact(shareholderContact);
-        return shareholderContactContainer;
-    }
-
     public BusinessDetails doingBusinessAs(String doingBusinessAs) {
         this.doingBusinessAs = doingBusinessAs;
         return this;

src/main/java/com/adyen/model/marketpay/CreateAccountHolderResponse.java

@@ -209,13 +209,13 @@ public void setInvalidFields(List<ErrorFieldType> invalidFields) {
         this.invalidFieldsContainers = new ArrayList<ErrorFieldTypeContainer>();
         for (ErrorFieldType invalidField : invalidFields) {
 
-            ErrorFieldTypeContainer invalidFieldContainer = createInvalidFieldContainerFromInvalidField(invalidField);
+            ErrorFieldTypeContainer invalidFieldContainer = new ErrorFieldTypeContainer(invalidField);
             this.invalidFieldsContainers.add(invalidFieldContainer);
         }
     }
 
     public CreateAccountHolderResponse addInvalidField(ErrorFieldType invalidField) {
-        ErrorFieldTypeContainer invalidFieldContainer = createInvalidFieldContainerFromInvalidField(invalidField);
+        ErrorFieldTypeContainer invalidFieldContainer = new ErrorFieldTypeContainer(invalidField);
 
         if (invalidFieldsContainers == null) {
             invalidFieldsContainers = new ArrayList<ErrorFieldTypeContainer>();
@@ -230,12 +230,6 @@ public CreateAccountHolderResponse addInvalidField(ErrorFieldType invalidField)
         return this;
     }
 
-    private ErrorFieldTypeContainer createInvalidFieldContainerFromInvalidField(ErrorFieldType invalidField) {
-        ErrorFieldTypeContainer invalidFieldContainer = new ErrorFieldTypeContainer();
-        invalidFieldContainer.setErrorFieldType(invalidField);
-        return invalidFieldContainer;
-    }
-
     public CreateAccountHolderResponse accountHolderDetails(AccountHolderDetails accountHolderDetails) {
         this.accountHolderDetails = accountHolderDetails;
         return this;

src/main/java/com/adyen/model/marketpay/DocumentDetailContainer.java

@@ -18,7 +18,6 @@
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
-
 package com.adyen.model.marketpay;
 
 import java.util.Objects;
@@ -31,6 +30,10 @@ public class DocumentDetailContainer {
     @SerializedName("DocumentDetail")
     private DocumentDetail documentDetail = null;
 
+    public DocumentDetailContainer(DocumentDetail documentDetail) {
+        this.documentDetail = documentDetail;
+    }
+
     /**
      * documentDetail
      *

src/main/java/com/adyen/model/marketpay/ErrorFieldTypeContainer.java

@@ -18,7 +18,6 @@
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
-
 package com.adyen.model.marketpay;
 
 import java.util.Objects;
@@ -28,6 +27,10 @@ public class ErrorFieldTypeContainer {
     @SerializedName("ErrorFieldType")
     private ErrorFieldType errorFieldType = null;
 
+    public ErrorFieldTypeContainer(ErrorFieldType errorFieldType) {
+        this.errorFieldType = errorFieldType;
+    }
+
     /**
      * errorFieldType
      *

src/main/java/com/adyen/model/marketpay/GetAccountHolderResponse.java

@@ -272,7 +272,7 @@ public void setAccounts(List<Account> accounts) {
 
         for (Account account : accounts) {
 
-            AccountContainer accountContainer = createAccountContainerFromAccount(account);
+            AccountContainer accountContainer = new AccountContainer(account);
             this.accountContainers.add(accountContainer);
         }
     }
@@ -284,7 +284,7 @@ public void setAccounts(List<Account> accounts) {
      * @return
      */
     public GetAccountHolderResponse addAccount(Account account) {
-        AccountContainer accountContainer = createAccountContainerFromAccount(account);
+        AccountContainer accountContainer = new AccountContainer(account);
 
         if (accountContainers == null) {
             accountContainers = new ArrayList<AccountContainer>();
@@ -301,12 +301,6 @@ public GetAccountHolderResponse addAccount(Account account) {
 
     }
 
-    private AccountContainer createAccountContainerFromAccount(Account account) {
-        AccountContainer accountContainer = new AccountContainer();
-        accountContainer.setAccount(account);
-        return accountContainer;
-    }
-
     public GetAccountHolderResponse pspReference(String pspReference) {
         this.pspReference = pspReference;
         return this;