Skip to content

Commit 36cae97

Browse files
lancergrlancergr
authored
Merge pull request #75 from Adyen/develop
Release 1.2.2
2 parents 814d6cd + 9d1176f commit 36cae97

File tree

15 files changed

+153
-160
lines changed

15 files changed

+153
-160
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
**Java version**: x.y.z
2+
**Library version**: x.y.z
3+
**Description**
4+
<!--
5+
- please provide description of the issue. In case of bug report, please provide the necessary steps to reproduce.
6+
- For merchant specific requests, please use https://support.adyen.com
7+
-->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
**Description**
2+
<!-- Please provide a description of the changes proposed in the Pull Request -->
3+
4+
**Tested scenarios**
5+
<!-- Description of tested scenarios -->
6+
7+
**Fixed issue**: <!-- #-prefixed issue number -->

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
2323
<dependency>
2424
<groupId>com.adyen</groupId>
2525
<artifactId>adyen-java-api-library</artifactId>
26-
<version>1.2.1</version>
26+
<version>1.2.2</version>
2727
</dependency>
2828
```
2929

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.adyen</groupId>
55
<artifactId>adyen-java-api-library</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.2.1</version>
7+
<version>1.2.2</version>
88
<name>Adyen Java API Library</name>
99
<description>Adyen API Client Library for Java</description>
1010
<url>https://github.com/adyen/adyen-java-api-library</url>

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* ######
33
* ######
44
* ############ ####( ###### #####. ###### ############ ############
@@ -25,17 +25,17 @@
2525
import com.adyen.httpclient.HttpURLConnectionClient;
2626

2727
public class Client {
28-
2928
private ClientInterface httpClient;
3029
private Config config;
3130

3231
public static final String ENDPOINT_TEST = "https://pal-test.adyen.com";
3332
public static final String ENDPOINT_LIVE = "https://pal-live.adyen.com";
3433
public static final String HPP_TEST = "https://test.adyen.com/hpp";
3534
public static final String HPP_LIVE = "https://live.adyen.com/hpp";
36-
public static final String API_VERSION = "v25";
35+
public static final String API_VERSION = "v30";
36+
public static final String RECURRING_API_VERSION = "v25";
3737
public static final String USER_AGENT_SUFFIX = "adyen-java-api-library/";
38-
public static final String LIB_VERSION = "1.2.1";
38+
public static final String LIB_VERSION = "1.2.2";
3939

4040
public Client() {
4141
this.config = new Config();
@@ -71,8 +71,7 @@ public void setEnvironment(Environment environment) {
7171

7272
@Override
7373
public String toString() {
74-
return "Client [webServiceUser=" + this.config.username + ", webServicePassword=" + this.config.password
75-
+ ", environment=" + this.config.environment + "]";
74+
return "Client [webServiceUser=" + this.config.username + ", webServicePassword=" + this.config.password + ", environment=" + this.config.environment + "]";
7675
}
7776

7877
public ClientInterface getHttpClient() {
@@ -96,14 +95,6 @@ public void setConfig(Config config) {
9695
this.config = config;
9796
}
9897

99-
public String getApiVersion() {
100-
return API_VERSION;
101-
}
102-
103-
public String getLibraryVersion() {
104-
return LIB_VERSION;
105-
}
106-
10798
public void setApplicationName(String applicationName) {
10899
this.config.setApplicationName(applicationName);
109100
}

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

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,30 @@ public class PaymentRequest extends AbstractPaymentRequest<PaymentRequest> {
4242
@SerializedName("bankAccount")
4343
private BankAccount bankAccount = null;
4444

45-
private List<InvoiceLine> invoiceLines = null;
45+
/**
46+
* how the shopper interacts with the system
47+
*/
48+
public enum RecurringProcessingModelEnum {
49+
@SerializedName("Subscription")
50+
SUBSCRIPTION("Subscription"),
51+
52+
@SerializedName("CardOnFile")
53+
CARD_ON_FILE("CardOnFile");
54+
55+
private String value;
56+
57+
RecurringProcessingModelEnum(String value) {
58+
this.value = value;
59+
}
60+
61+
@Override
62+
public String toString() {
63+
return String.valueOf(value);
64+
}
65+
}
66+
67+
@SerializedName("recurringProcessingModel")
68+
private RecurringProcessingModelEnum recurringProcessingModel = null;
4669

4770
public PaymentRequest setAmountData(String amount, String currency) {
4871
Amount amountData = Util.createAmount(amount, currency);
@@ -72,14 +95,21 @@ public PaymentRequest setPaymentToken(String paymentToken) {
7295
return this;
7396
}
7497

98+
public RecurringProcessingModelEnum getRecurringProcessingModel() {
99+
return recurringProcessingModel;
100+
}
101+
102+
public PaymentRequest setRecurringProcessingModel(RecurringProcessingModelEnum recurringProcessingModel) {
103+
this.recurringProcessingModel = recurringProcessingModel;
104+
return this;
105+
}
106+
75107
/**
76108
* Set invoiceLines in addtionalData
77109
*/
78110
public PaymentRequest setInvoiceLines(List<InvoiceLine> invoiceLines) {
79-
80111
Integer count = 1;
81112
for (InvoiceLine invoiceLine : invoiceLines) {
82-
83113
StringBuilder sb = new StringBuilder();
84114
sb.append("openinvoicedata.line");
85115
sb.append(Integer.toString(count));
@@ -194,6 +224,7 @@ public String toString() {
194224
sb.append(" card: ").append(toIndentedString(card)).append("\n");
195225
sb.append(" mpiData: ").append(toIndentedString(mpiData)).append("\n");
196226
sb.append(" bankAccount: ").append(toIndentedString(bankAccount)).append("\n");
227+
sb.append(" recurringProcessingModel: ").append(toIndentedString(recurringProcessingModel)).append("\n");
197228
sb.append("}");
198229
return sb.toString();
199230
}

‎src/main/java/com/adyen/service/resource/modification/Cancel.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* ######
33
* ######
44
* ############ ####( ###### #####. ###### ############ ############
@@ -21,18 +21,12 @@
2121
package com.adyen.service.resource.modification;
2222

2323
import java.util.Arrays;
24+
import com.adyen.Client;
2425
import com.adyen.Service;
2526
import com.adyen.service.Resource;
2627

2728
public class Cancel extends Resource {
28-
29-
public Cancel(Service service) {
30-
super(service,
31-
service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + service.getClient().getApiVersion() + "/cancel",
32-
Arrays.asList(
33-
"merchantAccount",
34-
"originalReference"
35-
)
36-
);
37-
}
29+
public Cancel(Service service) {
30+
super(service, service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + Client.API_VERSION + "/cancel", Arrays.asList("merchantAccount", "originalReference"));
31+
}
3832
}

‎src/main/java/com/adyen/service/resource/modification/CancelOrRefund.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* ######
33
* ######
44
* ############ ####( ###### #####. ###### ############ ############
@@ -21,17 +21,12 @@
2121
package com.adyen.service.resource.modification;
2222

2323
import java.util.Arrays;
24+
import com.adyen.Client;
2425
import com.adyen.Service;
2526
import com.adyen.service.Resource;
2627

2728
public class CancelOrRefund extends Resource {
28-
29-
public CancelOrRefund(Service service) {
30-
super(service,
31-
service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + service.getClient().getApiVersion() + "/cancelOrRefund",
32-
Arrays.asList(
33-
"merchantAccount",
34-
"originalReference")
35-
);
36-
}
29+
public CancelOrRefund(Service service) {
30+
super(service, service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + Client.API_VERSION + "/cancelOrRefund", Arrays.asList("merchantAccount", "originalReference"));
31+
}
3732
}

‎src/main/java/com/adyen/service/resource/modification/Capture.java‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* ######
33
* ######
44
* ############ ####( ###### #####. ###### ############ ############
@@ -22,24 +22,12 @@
2222

2323
import java.util.Arrays;
2424
import java.util.List;
25+
import com.adyen.Client;
2526
import com.adyen.Service;
2627
import com.adyen.service.Resource;
2728

2829
public class Capture extends Resource {
29-
30-
protected List<String> requiredFields = Arrays.asList(
31-
"merchantAccount",
32-
"originalReference"
33-
);
34-
35-
protected String endpoint;
36-
37-
public Capture(Service service) {
38-
super(service,
39-
service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + service.getClient().getApiVersion() + "/capture",
40-
Arrays.asList(
41-
"merchantAccount",
42-
"originalReference")
43-
);
44-
}
30+
public Capture(Service service) {
31+
super(service, service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + Client.API_VERSION + "/capture", Arrays.asList("merchantAccount", "originalReference"));
32+
}
4533
}

‎src/main/java/com/adyen/service/resource/modification/Refund.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* ######
33
* ######
44
* ############ ####( ###### #####. ###### ############ ############
@@ -21,21 +21,14 @@
2121
package com.adyen.service.resource.modification;
2222

2323
import java.util.Arrays;
24+
import com.adyen.Client;
2425
import com.adyen.Service;
2526
import com.adyen.service.Resource;
2627

2728
public class Refund extends Resource {
28-
2929
public Refund(Service service) {
3030
super(service,
31-
service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + service.getClient().getApiVersion() + "/refund",
32-
Arrays.asList(
33-
"merchantAccount",
34-
"modificationAmount",
35-
"modificationAmount.value",
36-
"modificationAmount.currency",
37-
"originalReference"
38-
)
39-
);
31+
service.getClient().getConfig().getEndpoint() + "/pal/servlet/Payment/" + Client.API_VERSION + "/refund",
32+
Arrays.asList("merchantAccount", "modificationAmount", "modificationAmount.value", "modificationAmount.currency", "originalReference"));
4033
}
4134
}

0 commit comments

Comments
 (0)