Merge pull request #59 from Adyen/release/3.3.0

Release 3.3.0
Adyen · Sep 13, 2024 · 360cf53 · 360cf53
2 parents 8ebfa7b + 00e5dde
commit 360cf53
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 101 deletions.
diff --git a/force-app/main/default/classes/CancelRequest.cls b/force-app/main/default/classes/CancelRequest.cls
@@ -0,0 +1,31 @@
+@NamespaceAccessible
+public with sharing class CancelRequest {
+    @NamespaceAccessible
+    public ApplicationInfo applicationInfo { get; set; }
+
+    @NamespaceAccessible
+    public String merchantAccount { get; set; }
+
+    @NamespaceAccessible
+    public String reference { get; set; }
+
+    @NamespaceAccessible
+    public Boolean equals(Object obj) {
+        if (obj instanceof CancelRequest) {
+            CancelRequest thatCancelRequest = (CancelRequest) obj;
+            return this.applicationInfo == thatCancelRequest.applicationInfo
+                && this.merchantAccount.equals(thatCancelRequest.merchantAccount)
+                && this.reference.equals(thatCancelRequest.reference);
+        }
+        return false;
+    }
+
+    @NamespaceAccessible
+    public Integer hashCode() {
+        Integer hashCode = 43;
+        hashCode = (17 * hashCode) + (applicationInfo == null ? 0 : System.hashCode(applicationInfo));
+        hashCode = (17 * hashCode) + (merchantAccount == null ? 0 : System.hashCode(merchantAccount));
+        hashCode = (17 * hashCode) + (reference == null ? 0 : System.hashCode(reference));
+        return hashCode;
+    }
+}
diff --git a/force-app/main/default/classes/CancelRequest.cls-meta.xml b/force-app/main/default/classes/CancelRequest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/CancelRequestTest.cls b/force-app/main/default/classes/CancelRequestTest.cls
@@ -0,0 +1,18 @@
+@IsTest
+private class CancelRequestTest {
+    @IsTest
+    static void cancelRequestTest() {
+        // given
+        CancelRequest cancelRequest = new CancelRequest();
+        cancelRequest.merchantAccount = 'test';
+        cancelRequest.reference = 'abc123';
+        CancelRequest cancelRequest2 = new CancelRequest();
+        cancelRequest2.merchantAccount = 'test 2';
+        cancelRequest2.reference = 'fgh456';
+        // then
+        Assert.areEqual(cancelRequest, cancelRequest);
+        Assert.areEqual(cancelRequest2, cancelRequest2);
+        Assert.areNotEqual(cancelRequest, cancelRequest2);
+        Assert.areNotEqual(cancelRequest.hashCode(), cancelRequest2.hashCode());
+    }
+}
diff --git a/force-app/main/default/classes/CancelRequestTest.cls-meta.xml b/force-app/main/default/classes/CancelRequestTest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/CancelResponse.cls b/force-app/main/default/classes/CancelResponse.cls
@@ -1,65 +1,33 @@
 /*
 * Represents the capture response object of the Adyen API
 */
-@namespaceAccessible
+@NamespaceAccessible
 public with sharing class CancelResponse {
 
-    /**
-    * Get errorCode
-    * @return errorCode
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String errorCode { get; set; }
 
-    /**
-    * Get errorType
-    * @return errorType
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String errorType { get; set; }
 
-    /**
-    * Get message
-    * @return message
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String message { get; set; }
 
-    /**
-    * Get merchantAccount
-    * @return merchantAccount
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String merchantAccount { get; set; }
 
-    /**
-    * Get paymentPspReference
-    * @return paymentPspReference
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String paymentPspReference { get; set; }
 
-    /**
-    * Get pspReference
-    * @return pspReference
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String pspReference { get; set; }
 
-    /**
-    * Get reference
-    * @return reference
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String reference { get; set; }
 
-    /**
-    * Get status
-    * @return status
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String status { get; set; }
 
-    @namespaceAccessible
-    public CancelResponse(){}
+    @NamespaceAccessible
+    public CancelResponse() {}
 }
diff --git a/force-app/main/default/classes/CancelResponse.cls-meta.xml b/force-app/main/default/classes/CancelResponse.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>52.0</apiVersion>
+    <apiVersion>61.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/CaptureRequest.cls b/force-app/main/default/classes/CaptureRequest.cls
@@ -1,118 +1,95 @@
 /*
 * Represents an Adyen Capture Request
 */
-@namespaceAccessible
+@NamespaceAccessible
 public with sharing class CaptureRequest implements ModificationRequest {
-
-    /**
-    * additional data
-    * @return additionalData
-    */
-    @namespaceAccessible
+
+    @NamespaceAccessible
     public String additionalData { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public String getAdditionalData() {
         return additionalData;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setAdditionalData(String additionalData) {
         this.additionalData = additionalData;
     }
 
-    /**
-    * application info
-    * @return applicationInfo
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public ApplicationInfo applicationInfo { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public ApplicationInfo getApplicationInfo() {
         return applicationInfo;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setApplicationInfo(ApplicationInfo applicationInfo) {
         this.applicationInfo = applicationInfo;
     }
 
-    /**
-    * original payment reference
-    * @return originalReference
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String originalReference { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public String getOriginalReference() {
         return originalReference;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setOriginalReference(String originalReference) {
         this.originalReference = originalReference;
     }
 
-    /**
-    * Payment capture amount
-    * @return amount
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public Amount modificationAmount { get; set; }
 
-    /**
-    * Payment capture amount
-    * @return amount
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public Amount amount { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public Amount getAmount() {
         return amount;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setAmount(Amount amount) {
         this.amount = amount;
     }
 
     /**
-    * 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.
-    * @return reference
+    * 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.
+    * If you need to provide multiple references for a transaction, separate them with hyphens ("-"). Maximum length: 80 characters.
     */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String reference { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public String getReference() {
         return reference;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setReference(String reference) {
         this.reference = reference;
     }
 
-    /**
-    * Merchant account name
-    * @return merchantAccount
-    */
-    @namespaceAccessible
+    @NamespaceAccessible
     public String merchantAccount { get; set; }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public String getMerchantAccount() {
         return merchantAccount;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public void setMerchantAccount(String merchantAccount) {
         this.merchantAccount = merchantAccount;
     }
 
-    @namespaceAccessible
+    @NamespaceAccessible
     public CaptureRequest(){}
 }
diff --git a/force-app/main/default/classes/CaptureRequest.cls-meta.xml b/force-app/main/default/classes/CaptureRequest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>52.0</apiVersion>
+    <apiVersion>61.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/CheckoutCaptureRequest.cls-meta.xml b/force-app/main/default/classes/CheckoutCaptureRequest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>52.0</apiVersion>
+    <apiVersion>61.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/HMACValidator.cls-meta.xml b/force-app/main/default/classes/HMACValidator.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>60.0</apiVersion>
+    <apiVersion>61.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/force-app/main/default/classes/ModificationRequest.cls b/force-app/main/default/classes/ModificationRequest.cls
@@ -1,4 +1,4 @@
-@namespaceAccessible
+@NamespaceAccessible
 public interface ModificationRequest {
     //interface to declare common methods from CaptureRequest and RefundRequest
     String getAdditionalData();

diff --git a/force-app/main/default/classes/ModificationRequest.cls-meta.xml b/force-app/main/default/classes/ModificationRequest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>52.0</apiVersion>
+    <apiVersion>61.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-project.json b/sfdx-project.json
@@ -4,15 +4,15 @@
       "path": "force-app",
       "default": true,
       "package": "API Library Apex Adyen",
-      "versionName": "version 3.2",
-      "versionNumber": "3.2.0.NEXT",
+      "versionName": "version 3.3",
+      "versionNumber": "3.3.0.NEXT",
       "ancestorVersion": "HIGHEST"
     }
   ],
   "name": "adyen-apex-api-lib-2GP",
   "namespace": "adyen_payment",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "60.0",
+  "sourceApiVersion": "61.0",
   "packageAliases": {
     "API Library Apex Adyen": "0Ho4T0000000043SAA",
     "API Library Apex Adyen@0.1.0-1": "04t4T000001VvbqQAC",
@@ -22,6 +22,7 @@
     "API Library Apex Adyen@3.0.1-1": "04tRP0000000A5pYAE",
     "API Library Apex Adyen@3.1.0-1": "04tRP0000000D25YAE",
     "API Library Apex Adyen@3.1.1-1": "04tRP0000000XGvYAM",
-    "API Library Apex Adyen@3.2.0-5": "04tRP0000000lwbYAA"
+    "API Library Apex Adyen@3.2.0-5": "04tRP0000000lwbYAA",
+    "API Library Apex Adyen@3.3.0-1": "04tRP0000000vZNYAY"
   }
 }