Skip to content

Commit 360cf53

Browse files
dcardosdcardos
authored
Merge pull request #59 from Adyen/release/3.3.0
Release 3.3.0
2 parents 8ebfa7b + 00e5dde commit 360cf53

13 files changed

+106
-101
lines changed

‎force-app/main/default/classes/CancelRequest.cls‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
@NamespaceAccessible
2+
public with sharing class CancelRequest {
3+
@NamespaceAccessible
4+
public ApplicationInfo applicationInfo { get; set; }
5+
6+
@NamespaceAccessible
7+
public String merchantAccount { get; set; }
8+
9+
@NamespaceAccessible
10+
public String reference { get; set; }
11+
12+
@NamespaceAccessible
13+
public Boolean equals(Object obj) {
14+
if (obj instanceof CancelRequest) {
15+
CancelRequest thatCancelRequest = (CancelRequest) obj;
16+
return this.applicationInfo == thatCancelRequest.applicationInfo
17+
&& this.merchantAccount.equals(thatCancelRequest.merchantAccount)
18+
&& this.reference.equals(thatCancelRequest.reference);
19+
}
20+
return false;
21+
}
22+
23+
@NamespaceAccessible
24+
public Integer hashCode() {
25+
Integer hashCode = 43;
26+
hashCode = (17 * hashCode) + (applicationInfo == null ? 0 : System.hashCode(applicationInfo));
27+
hashCode = (17 * hashCode) + (merchantAccount == null ? 0 : System.hashCode(merchantAccount));
28+
hashCode = (17 * hashCode) + (reference == null ? 0 : System.hashCode(reference));
29+
return hashCode;
30+
}
31+
}

‎force-app/main/default/classes/CancelRequest.cls-meta.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<apiVersion>61.0</apiVersion>
4+
<status>Active</status>
5+
</ApexClass>

‎force-app/main/default/classes/CancelRequestTest.cls‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@IsTest
2+
private class CancelRequestTest {
3+
@IsTest
4+
static void cancelRequestTest() {
5+
// given
6+
CancelRequest cancelRequest = new CancelRequest();
7+
cancelRequest.merchantAccount = 'test';
8+
cancelRequest.reference = 'abc123';
9+
CancelRequest cancelRequest2 = new CancelRequest();
10+
cancelRequest2.merchantAccount = 'test 2';
11+
cancelRequest2.reference = 'fgh456';
12+
// then
13+
Assert.areEqual(cancelRequest, cancelRequest);
14+
Assert.areEqual(cancelRequest2, cancelRequest2);
15+
Assert.areNotEqual(cancelRequest, cancelRequest2);
16+
Assert.areNotEqual(cancelRequest.hashCode(), cancelRequest2.hashCode());
17+
}
18+
}

‎force-app/main/default/classes/CancelRequestTest.cls-meta.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<apiVersion>61.0</apiVersion>
4+
<status>Active</status>
5+
</ApexClass>

‎force-app/main/default/classes/CancelResponse.cls‎

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,33 @@
11
/*
22
* Represents the capture response object of the Adyen API
33
*/
4-
@namespaceAccessible
4+
@NamespaceAccessible
55
public with sharing class CancelResponse {
66

7-
/**
8-
* Get errorCode
9-
* @return errorCode
10-
*/
11-
@namespaceAccessible
7+
@NamespaceAccessible
128
public String errorCode { get; set; }
139

14-
/**
15-
* Get errorType
16-
* @return errorType
17-
*/
18-
@namespaceAccessible
10+
@NamespaceAccessible
1911
public String errorType { get; set; }
2012

21-
/**
22-
* Get message
23-
* @return message
24-
*/
25-
@namespaceAccessible
13+
@NamespaceAccessible
2614
public String message { get; set; }
2715

28-
/**
29-
* Get merchantAccount
30-
* @return merchantAccount
31-
*/
32-
@namespaceAccessible
16+
@NamespaceAccessible
3317
public String merchantAccount { get; set; }
3418

35-
/**
36-
* Get paymentPspReference
37-
* @return paymentPspReference
38-
*/
39-
@namespaceAccessible
19+
@NamespaceAccessible
4020
public String paymentPspReference { get; set; }
4121

42-
/**
43-
* Get pspReference
44-
* @return pspReference
45-
*/
46-
@namespaceAccessible
22+
@NamespaceAccessible
4723
public String pspReference { get; set; }
4824

49-
/**
50-
* Get reference
51-
* @return reference
52-
*/
53-
@namespaceAccessible
25+
@NamespaceAccessible
5426
public String reference { get; set; }
5527

56-
/**
57-
* Get status
58-
* @return status
59-
*/
60-
@namespaceAccessible
28+
@NamespaceAccessible
6129
public String status { get; set; }
6230

63-
@namespaceAccessible
64-
public CancelResponse(){}
31+
@NamespaceAccessible
32+
public CancelResponse() {}
6533
}

‎force-app/main/default/classes/CancelResponse.cls-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<apiVersion>52.0</apiVersion>
3+
<apiVersion>61.0</apiVersion>
44
<status>Active</status>
55
</ApexClass>

‎force-app/main/default/classes/CaptureRequest.cls‎

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,95 @@
11
/*
22
* Represents an Adyen Capture Request
33
*/
4-
@namespaceAccessible
4+
@NamespaceAccessible
55
public with sharing class CaptureRequest implements ModificationRequest {
6-
7-
/**
8-
* additional data
9-
* @return additionalData
10-
*/
11-
@namespaceAccessible
6+
7+
@NamespaceAccessible
128
public String additionalData { get; set; }
139

14-
@namespaceAccessible
10+
@NamespaceAccessible
1511
public String getAdditionalData() {
1612
return additionalData;
1713
}
1814

19-
@namespaceAccessible
15+
@NamespaceAccessible
2016
public void setAdditionalData(String additionalData) {
2117
this.additionalData = additionalData;
2218
}
2319

24-
/**
25-
* application info
26-
* @return applicationInfo
27-
*/
28-
@namespaceAccessible
20+
@NamespaceAccessible
2921
public ApplicationInfo applicationInfo { get; set; }
3022

31-
@namespaceAccessible
23+
@NamespaceAccessible
3224
public ApplicationInfo getApplicationInfo() {
3325
return applicationInfo;
3426
}
3527

36-
@namespaceAccessible
28+
@NamespaceAccessible
3729
public void setApplicationInfo(ApplicationInfo applicationInfo) {
3830
this.applicationInfo = applicationInfo;
3931
}
4032

41-
/**
42-
* original payment reference
43-
* @return originalReference
44-
*/
45-
@namespaceAccessible
33+
@NamespaceAccessible
4634
public String originalReference { get; set; }
4735

48-
@namespaceAccessible
36+
@NamespaceAccessible
4937
public String getOriginalReference() {
5038
return originalReference;
5139
}
5240

53-
@namespaceAccessible
41+
@NamespaceAccessible
5442
public void setOriginalReference(String originalReference) {
5543
this.originalReference = originalReference;
5644
}
5745

58-
/**
59-
* Payment capture amount
60-
* @return amount
61-
*/
62-
@namespaceAccessible
46+
@NamespaceAccessible
6347
public Amount modificationAmount { get; set; }
6448

65-
/**
66-
* Payment capture amount
67-
* @return amount
68-
*/
69-
@namespaceAccessible
49+
@NamespaceAccessible
7050
public Amount amount { get; set; }
7151

72-
@namespaceAccessible
52+
@NamespaceAccessible
7353
public Amount getAmount() {
7454
return amount;
7555
}
7656

77-
@namespaceAccessible
57+
@NamespaceAccessible
7858
public void setAmount(Amount amount) {
7959
this.amount = amount;
8060
}
8161

8262
/**
83-
* The reference to uniquely identify a payment. This reference is used in all communication with you about the payment status. We recommend using a unique value per payment; however, it is not a requirement.\nIf you need to provide multiple references for a transaction, separate them with hyphens ("-").\nMaximum length: 80 characters.
84-
* @return reference
63+
* The reference to uniquely identify a payment. This reference is used in all communication with you about the payment status.
64+
* We recommend using a unique value per payment; however, it is not a requirement.
65+
* If you need to provide multiple references for a transaction, separate them with hyphens ("-"). Maximum length: 80 characters.
8566
*/
86-
@namespaceAccessible
67+
@NamespaceAccessible
8768
public String reference { get; set; }
8869

89-
@namespaceAccessible
70+
@NamespaceAccessible
9071
public String getReference() {
9172
return reference;
9273
}
9374

94-
@namespaceAccessible
75+
@NamespaceAccessible
9576
public void setReference(String reference) {
9677
this.reference = reference;
9778
}
9879

99-
/**
100-
* Merchant account name
101-
* @return merchantAccount
102-
*/
103-
@namespaceAccessible
80+
@NamespaceAccessible
10481
public String merchantAccount { get; set; }
10582

106-
@namespaceAccessible
83+
@NamespaceAccessible
10784
public String getMerchantAccount() {
10885
return merchantAccount;
10986
}
11087

111-
@namespaceAccessible
88+
@NamespaceAccessible
11289
public void setMerchantAccount(String merchantAccount) {
11390
this.merchantAccount = merchantAccount;
11491
}
11592

116-
@namespaceAccessible
93+
@NamespaceAccessible
11794
public CaptureRequest(){}
11895
}

‎force-app/main/default/classes/CaptureRequest.cls-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<apiVersion>52.0</apiVersion>
3+
<apiVersion>61.0</apiVersion>
44
<status>Active</status>
55
</ApexClass>

‎force-app/main/default/classes/CheckoutCaptureRequest.cls-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<apiVersion>52.0</apiVersion>
3+
<apiVersion>61.0</apiVersion>
44
<status>Active</status>
55
</ApexClass>

‎force-app/main/default/classes/HMACValidator.cls-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<apiVersion>60.0</apiVersion>
3+
<apiVersion>61.0</apiVersion>
44
<status>Active</status>
55
</ApexClass>

0 commit comments

Comments
 (0)