Merge pull request #94 from Adyen/mp-versions

lancergr · web-flow · commit 528927a60ee3 · 2018-04-30T14:25:27.000+02:00
Use v1 for MarketPay notification configuration API calls
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.adyen</groupId>
   <artifactId>adyen-java-api-library</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <name>Adyen Java API Library</name>
     <description>Adyen API Client Library for Java</description>
     <url>https://github.com/adyen/adyen-java-api-library</url>
diff --git a/src/main/java/com/adyen/Client.java b/src/main/java/com/adyen/Client.java
@@ -36,9 +36,11 @@ public class Client {
     public static final String MARKETPAY_ENDPOINT_LIVE = "https://cal-live.adyen.com/cal/services";
     public static final String API_VERSION = "v30";
     public static final String RECURRING_API_VERSION = "v25";
-    public static final String MARKETPAY_API_VERSION = "v3";
+    public static final String MARKETPAY_ACCOUNT_API_VERSION = "v3";
+    public static final String MARKETPAY_FUND_API_VERSION = "v3";
+    public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v1";
     public static final String USER_AGENT_SUFFIX = "adyen-java-api-library/";
-    public static final String LIB_VERSION = "1.4.0";
+    public static final String LIB_VERSION = "1.4.1";
 
     public Client() {
         this.config = new Config();
diff --git a/src/main/java/com/adyen/service/resource/account/CloseAccount.java b/src/main/java/com/adyen/service/resource/account/CloseAccount.java
@@ -28,6 +28,6 @@
 public class CloseAccount extends Resource {
 
     public CloseAccount(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/closeAccount", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/closeAccount", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/CloseAccountHolder.java b/src/main/java/com/adyen/service/resource/account/CloseAccountHolder.java
@@ -28,6 +28,6 @@
 public class CloseAccountHolder extends Resource {
 
     public CloseAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/closeAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/closeAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/CreateAccount.java b/src/main/java/com/adyen/service/resource/account/CreateAccount.java
@@ -28,6 +28,6 @@
 public class CreateAccount extends Resource {
 
     public CreateAccount(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/createAccount", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/createAccount", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/CreateAccountHolder.java b/src/main/java/com/adyen/service/resource/account/CreateAccountHolder.java
@@ -28,6 +28,6 @@
 public class CreateAccountHolder extends Resource {
 
     public CreateAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/createAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/createAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/DeleteBankAccount.java b/src/main/java/com/adyen/service/resource/account/DeleteBankAccount.java
@@ -28,6 +28,6 @@
 public class DeleteBankAccount extends Resource {
 
     public DeleteBankAccount(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/deleteBankAccounts", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/deleteBankAccounts", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/DeleteShareholder.java b/src/main/java/com/adyen/service/resource/account/DeleteShareholder.java
@@ -28,6 +28,6 @@
 public class DeleteShareholder extends Resource {
 
     public DeleteShareholder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/deleteShareholders", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/deleteShareholders", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/GetAccountHolder.java b/src/main/java/com/adyen/service/resource/account/GetAccountHolder.java
@@ -28,6 +28,6 @@
 public class GetAccountHolder extends Resource {
 
     public GetAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/getAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/getAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/GetTierConfiguration.java b/src/main/java/com/adyen/service/resource/account/GetTierConfiguration.java
@@ -28,6 +28,6 @@
 public class GetTierConfiguration extends Resource {
 
     public GetTierConfiguration(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/getTierConfiguration", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/getTierConfiguration", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/GetUploadedDocuments.java b/src/main/java/com/adyen/service/resource/account/GetUploadedDocuments.java
@@ -28,6 +28,6 @@
 public class GetUploadedDocuments extends Resource {
 
     public GetUploadedDocuments(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/getUploadedDocuments", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/getUploadedDocuments", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/SuspendAccountHolder.java b/src/main/java/com/adyen/service/resource/account/SuspendAccountHolder.java
@@ -28,6 +28,6 @@
 public class SuspendAccountHolder extends Resource {
 
     public SuspendAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/suspendAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/suspendAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/UnSuspendAccountHolder.java b/src/main/java/com/adyen/service/resource/account/UnSuspendAccountHolder.java
@@ -28,6 +28,6 @@
 public class UnSuspendAccountHolder extends Resource {
 
     public UnSuspendAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/unSuspendAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/unSuspendAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/UpdateAccount.java b/src/main/java/com/adyen/service/resource/account/UpdateAccount.java
@@ -28,6 +28,6 @@
 public class UpdateAccount extends Resource {
 
     public UpdateAccount(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/updateAccount", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/updateAccount", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/UpdateAccountHolder.java b/src/main/java/com/adyen/service/resource/account/UpdateAccountHolder.java
@@ -28,6 +28,6 @@
 public class UpdateAccountHolder extends Resource {
 
     public UpdateAccountHolder(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/updateAccountHolder", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/updateAccountHolder", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/UpdateAccountHolderState.java b/src/main/java/com/adyen/service/resource/account/UpdateAccountHolderState.java
@@ -28,6 +28,6 @@
 public class UpdateAccountHolderState extends Resource {
 
     public UpdateAccountHolderState(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/updateAccountHolderState", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/updateAccountHolderState", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/account/UploadDocument.java b/src/main/java/com/adyen/service/resource/account/UploadDocument.java
@@ -28,6 +28,6 @@
 public class UploadDocument extends Resource {
 
     public UploadDocument(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/uploadDocument", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/uploadDocument", null);
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/AccountHolderBalance.java b/src/main/java/com/adyen/service/resource/fund/AccountHolderBalance.java
@@ -28,7 +28,7 @@
 public class AccountHolderBalance extends Resource {
 
     public AccountHolderBalance(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/accountHolderBalance", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/accountHolderBalance", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/AccountHolderTransactionList.java b/src/main/java/com/adyen/service/resource/fund/AccountHolderTransactionList.java
@@ -27,7 +27,7 @@
 public class AccountHolderTransactionList extends Resource {
 
     public AccountHolderTransactionList(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/accountHolderTransactionList", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/accountHolderTransactionList", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/PayoutAccountHolder.java b/src/main/java/com/adyen/service/resource/fund/PayoutAccountHolder.java
@@ -21,17 +21,14 @@
 
 package com.adyen.service.resource.fund;
 
-import java.util.Arrays;
-
 import com.adyen.Client;
 import com.adyen.Service;
 import com.adyen.service.Resource;
 
 public class PayoutAccountHolder extends Resource {
 
     public PayoutAccountHolder(Service service) {
-        super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/payoutAccountHolder",null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/payoutAccountHolder", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/RefundNotPaidOutTransfers.java b/src/main/java/com/adyen/service/resource/fund/RefundNotPaidOutTransfers.java
@@ -28,7 +28,7 @@
 public class RefundNotPaidOutTransfers extends Resource {
 
     public RefundNotPaidOutTransfers(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/refundNotPaidOutTransfers", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/refundNotPaidOutTransfers", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/SetupBeneficiary.java b/src/main/java/com/adyen/service/resource/fund/SetupBeneficiary.java
@@ -28,7 +28,7 @@
 public class SetupBeneficiary extends Resource {
 
     public SetupBeneficiary(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/setupBeneficiary", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/setupBeneficiary", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/fund/TransferFunds.java b/src/main/java/com/adyen/service/resource/fund/TransferFunds.java
@@ -28,7 +28,7 @@
 public class TransferFunds extends Resource {
 
     public TransferFunds(Service service) {
-        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_API_VERSION + "/transferFunds", null);
+        super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/transferFunds", null);
     }
 
 }
diff --git a/src/main/java/com/adyen/service/resource/notification/CreateNotificationConfiguration.java b/src/main/java/com/adyen/service/resource/notification/CreateNotificationConfiguration.java
@@ -10,7 +10,7 @@ public class CreateNotificationConfiguration extends Resource {
 
     public CreateNotificationConfiguration(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/createNotificationConfiguration",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/createNotificationConfiguration",
               Arrays.asList(
                       "configurationDetails"
               )
diff --git a/src/main/java/com/adyen/service/resource/notification/DeleteNotificationConfigurations.java b/src/main/java/com/adyen/service/resource/notification/DeleteNotificationConfigurations.java
@@ -11,7 +11,7 @@ public class DeleteNotificationConfigurations extends Resource {
 
     public DeleteNotificationConfigurations(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/deleteNotificationConfigurations",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/deleteNotificationConfigurations",
               Arrays.asList(
                       "notificationIds"
               )
diff --git a/src/main/java/com/adyen/service/resource/notification/GetNotificationConfiguration.java b/src/main/java/com/adyen/service/resource/notification/GetNotificationConfiguration.java
@@ -10,7 +10,7 @@ public class GetNotificationConfiguration extends Resource {
 
     public GetNotificationConfiguration(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/getNotificationConfiguration",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/getNotificationConfiguration",
               Arrays.asList(
                       "notificationId"
               )
diff --git a/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java b/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java
@@ -31,7 +31,7 @@ public class GetNotificationConfigurationList extends Resource {
 
     public GetNotificationConfigurationList(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/getNotificationConfigurationList",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/getNotificationConfigurationList",
               new ArrayList<String>());
     }
 }
diff --git a/src/main/java/com/adyen/service/resource/notification/TestNotificationConfiguration.java b/src/main/java/com/adyen/service/resource/notification/TestNotificationConfiguration.java
@@ -11,7 +11,7 @@ public class TestNotificationConfiguration extends Resource {
 
     public TestNotificationConfiguration(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/testNotificationConfiguration",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/testNotificationConfiguration",
               Arrays.asList(
                       "eventTypes",
                       "notificationId"
diff --git a/src/main/java/com/adyen/service/resource/notification/UpdateNotificationConfiguration.java b/src/main/java/com/adyen/service/resource/notification/UpdateNotificationConfiguration.java
@@ -9,7 +9,7 @@ public class UpdateNotificationConfiguration extends Resource {
 
     public UpdateNotificationConfiguration(Service service) {
         super(service,
-              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_API_VERSION + "/updateNotificationConfiguration",
+              service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/updateNotificationConfiguration",
               Arrays.asList(
                       "configurationDetails"
               )

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@`
`28`	`28`	`public class CloseAccount extends Resource {`
`29`	`29`
`30`	`30`	`public CloseAccount(Service service) {`
`31`		`- super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_API_VERSION + "/closeAccount", null);`
	`31`	`+ super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Account/" + Client.MARKETPAY_ACCOUNT_API_VERSION + "/closeAccount", null);`
`32`	`32`	`}`
`33`	`33`	`}`