From 79d01635de2880e1e2e8a5f7452d3a133d9c8b16 Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Thu, 18 May 2023 17:51:32 +0300 Subject: [PATCH 01/55] Update state validation from 2 to 5 characters --- src/main/java/com/safecharge/model/RestApiUserDetails.java | 4 ++-- src/main/java/com/safecharge/model/UserAddress.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/safecharge/model/RestApiUserDetails.java b/src/main/java/com/safecharge/model/RestApiUserDetails.java index 66dd6ff..819ca4d 100644 --- a/src/main/java/com/safecharge/model/RestApiUserDetails.java +++ b/src/main/java/com/safecharge/model/RestApiUserDetails.java @@ -44,8 +44,8 @@ public class RestApiUserDetails { message = "country size must be up to 2 characters long!") private String country; - @Size(max = 2, - message = "state size must be up to 2 characters long!") + @Size(max = 5, + message = "state size must be up to 5 characters long!") private String state; @Size(max = APIConstants.ZIP_MAX_LENGTH, diff --git a/src/main/java/com/safecharge/model/UserAddress.java b/src/main/java/com/safecharge/model/UserAddress.java index daad348..95b9851 100644 --- a/src/main/java/com/safecharge/model/UserAddress.java +++ b/src/main/java/com/safecharge/model/UserAddress.java @@ -63,7 +63,7 @@ public class UserAddress { /** * The state of the recipient(two-letter ISO state code) */ - @Size(max = 2, message = "state size must be up to 2 characters long!") + @Size(max = 5, message = "state size must be up to 5 characters long!") private String state; /** From de770cd2f8b17d3f011d0f890912d9ee2d99d7d3 Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Mon, 29 May 2023 16:23:55 +0300 Subject: [PATCH 02/55] Update version --- README.md | 4 ++-- pom-github.xml | 2 +- pom-internal.xml | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e249910..77146c4 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.0 + 1.7.1 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.0 + 1.7.1 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index d88f912..7996baa 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.0 + 1.7.1 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom-internal.xml b/pom-internal.xml index 638e371..94e3761 100644 --- a/pom-internal.xml +++ b/pom-internal.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.0 + 1.7.1 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index 638e371..94e3761 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.0 + 1.7.1 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From cdfeb74c34884ba00a1b4c7523c460700c28f943 Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Fri, 16 Jun 2023 16:26:33 +0300 Subject: [PATCH 03/55] pbi/be-599558 -add ExternalTokenProvider --- src/main/java/com/safecharge/model/Card.java | 4 ++-- .../com/safecharge/model/ExternalToken.java | 22 +++++++++++++++++++ .../com/safecharge/model/InitPaymentCard.java | 20 +++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/safecharge/model/Card.java b/src/main/java/com/safecharge/model/Card.java index 9a7115c..59171cb 100644 --- a/src/main/java/com/safecharge/model/Card.java +++ b/src/main/java/com/safecharge/model/Card.java @@ -8,7 +8,7 @@ public class Card extends CardData { - private ExternalToken externalToken; + private ExternalTokenProvider externalToken; private StoredCredentials storedCredentials; @@ -21,7 +21,7 @@ public ExternalToken getExternalToken() { return externalToken; } - public void setExternalToken(ExternalToken externalToken) { + public void setExternalToken(ExternalTokenProvider externalToken) { this.externalToken = externalToken; } diff --git a/src/main/java/com/safecharge/model/ExternalToken.java b/src/main/java/com/safecharge/model/ExternalToken.java index cb0ac35..ff8136c 100644 --- a/src/main/java/com/safecharge/model/ExternalToken.java +++ b/src/main/java/com/safecharge/model/ExternalToken.java @@ -14,6 +14,28 @@ public class ExternalToken { @Size(max = 5000) private String mobileToken; + @Size(max = 2) + private String eciProvider; + + @Size(max = 100) + private String cryptogram; + + public String getEciProvider() { + return eciProvider; + } + + public void setEciProvider(String eciProvider) { + this.eciProvider = eciProvider; + } + + public String getCryptogram() { + return cryptogram; + } + + public void setCryptogram(String cryptogram) { + this.cryptogram = cryptogram; + } + public String getExternalTokenProvider() { return externalTokenProvider; } diff --git a/src/main/java/com/safecharge/model/InitPaymentCard.java b/src/main/java/com/safecharge/model/InitPaymentCard.java index 2398e14..ba909d1 100644 --- a/src/main/java/com/safecharge/model/InitPaymentCard.java +++ b/src/main/java/com/safecharge/model/InitPaymentCard.java @@ -6,8 +6,28 @@ public class InitPaymentCard extends CardData { + private ExternalTokenProvider externalToken; + private InitPaymentThreeD threeD; + private String acquirerId; + + public String getAcquirerId() { + return acquirerId; + } + + public void setAcquirerId(String acquirerId) { + this.acquirerId = acquirerId; + } + + public ExternalTokenProvider getExternalToken() { + return externalToken; + } + + public void setExternalToken(ExternalTokenProvider externalToken) { + this.externalToken = externalToken; + } + public InitPaymentThreeD getThreeD() { return threeD; } From 96295b269951428295edb6d12fc29a8a13e050e9 Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Wed, 21 Jun 2023 11:44:55 +0300 Subject: [PATCH 04/55] pbi/be-599558 - fix getExternalToken getter in Card --- src/main/java/com/safecharge/model/Card.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/safecharge/model/Card.java b/src/main/java/com/safecharge/model/Card.java index 59171cb..6d9cdb0 100644 --- a/src/main/java/com/safecharge/model/Card.java +++ b/src/main/java/com/safecharge/model/Card.java @@ -17,7 +17,7 @@ public class Card extends CardData { private ThreeD threeD; - public ExternalToken getExternalToken() { + public ExternalTokenProvider getExternalToken() { return externalToken; } From 8eecd54b999cc00d24ff80a4fc16c787a51404b1 Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Mon, 10 Jul 2023 10:13:08 +0000 Subject: [PATCH 05/55] Merged PR 51974: pbi/be-599558-fix_response fix_property in CardResponse change property from ExternalTokenProvider to private String externalTokenProvider; The same as in Chashier com.safecharge.ppp.api.dto.cashier.rest.payment.CardResponseDTO Related work items: #607411 --- src/main/java/com/safecharge/model/CardResponse.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/safecharge/model/CardResponse.java b/src/main/java/com/safecharge/model/CardResponse.java index 3b75a7c..7ad5117 100644 --- a/src/main/java/com/safecharge/model/CardResponse.java +++ b/src/main/java/com/safecharge/model/CardResponse.java @@ -9,7 +9,7 @@ public class CardResponse { private ApiExternalToken externalToken; - private ExternalTokenProvider externalTokenProvider; + private String externalTokenProvider; private String ccCardNumber; private String bin; private String last4Digits; @@ -34,11 +34,11 @@ public void setExternalToken(ApiExternalToken externalToken) { this.externalToken = externalToken; } - public ExternalTokenProvider getExternalTokenProvider() { + public String getExternalTokenProvider() { return externalTokenProvider; } - public void setExternalTokenProvider(ExternalTokenProvider externalTokenProvider) { + public void setExternalTokenProvider(String externalTokenProvider) { this.externalTokenProvider = externalTokenProvider; } From cbdfa2c3c4f34961b7b0ebe86ac2e401caf3c8de Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Wed, 19 Jul 2023 19:13:30 +0300 Subject: [PATCH 06/55] Update pom to version 1.7.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94e3761..ac0d2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.2 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From 7976d25e972edf9ffa7180dfc6db2437e868f1a8 Mon Sep 17 00:00:00 2001 From: Radostin Tonev Date: Thu, 20 Jul 2023 11:42:51 +0000 Subject: [PATCH 07/55] Merged PR 52783: #599558 JavaSDK - New Release (Changes verified by QA) Bug fixes in external token provider functionality and extending the functionality to initPayment. Related work items: #599558, #607411 --- pom.xml | 2 +- src/main/java/com/safecharge/model/Card.java | 6 ++--- .../com/safecharge/model/CardResponse.java | 6 ++--- .../com/safecharge/model/ExternalToken.java | 22 +++++++++++++++++++ .../com/safecharge/model/InitPaymentCard.java | 20 +++++++++++++++++ 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 94e3761..ac0d2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.2 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/src/main/java/com/safecharge/model/Card.java b/src/main/java/com/safecharge/model/Card.java index 9a7115c..6d9cdb0 100644 --- a/src/main/java/com/safecharge/model/Card.java +++ b/src/main/java/com/safecharge/model/Card.java @@ -8,7 +8,7 @@ public class Card extends CardData { - private ExternalToken externalToken; + private ExternalTokenProvider externalToken; private StoredCredentials storedCredentials; @@ -17,11 +17,11 @@ public class Card extends CardData { private ThreeD threeD; - public ExternalToken getExternalToken() { + public ExternalTokenProvider getExternalToken() { return externalToken; } - public void setExternalToken(ExternalToken externalToken) { + public void setExternalToken(ExternalTokenProvider externalToken) { this.externalToken = externalToken; } diff --git a/src/main/java/com/safecharge/model/CardResponse.java b/src/main/java/com/safecharge/model/CardResponse.java index 3b75a7c..7ad5117 100644 --- a/src/main/java/com/safecharge/model/CardResponse.java +++ b/src/main/java/com/safecharge/model/CardResponse.java @@ -9,7 +9,7 @@ public class CardResponse { private ApiExternalToken externalToken; - private ExternalTokenProvider externalTokenProvider; + private String externalTokenProvider; private String ccCardNumber; private String bin; private String last4Digits; @@ -34,11 +34,11 @@ public void setExternalToken(ApiExternalToken externalToken) { this.externalToken = externalToken; } - public ExternalTokenProvider getExternalTokenProvider() { + public String getExternalTokenProvider() { return externalTokenProvider; } - public void setExternalTokenProvider(ExternalTokenProvider externalTokenProvider) { + public void setExternalTokenProvider(String externalTokenProvider) { this.externalTokenProvider = externalTokenProvider; } diff --git a/src/main/java/com/safecharge/model/ExternalToken.java b/src/main/java/com/safecharge/model/ExternalToken.java index cb0ac35..ff8136c 100644 --- a/src/main/java/com/safecharge/model/ExternalToken.java +++ b/src/main/java/com/safecharge/model/ExternalToken.java @@ -14,6 +14,28 @@ public class ExternalToken { @Size(max = 5000) private String mobileToken; + @Size(max = 2) + private String eciProvider; + + @Size(max = 100) + private String cryptogram; + + public String getEciProvider() { + return eciProvider; + } + + public void setEciProvider(String eciProvider) { + this.eciProvider = eciProvider; + } + + public String getCryptogram() { + return cryptogram; + } + + public void setCryptogram(String cryptogram) { + this.cryptogram = cryptogram; + } + public String getExternalTokenProvider() { return externalTokenProvider; } diff --git a/src/main/java/com/safecharge/model/InitPaymentCard.java b/src/main/java/com/safecharge/model/InitPaymentCard.java index 2398e14..ba909d1 100644 --- a/src/main/java/com/safecharge/model/InitPaymentCard.java +++ b/src/main/java/com/safecharge/model/InitPaymentCard.java @@ -6,8 +6,28 @@ public class InitPaymentCard extends CardData { + private ExternalTokenProvider externalToken; + private InitPaymentThreeD threeD; + private String acquirerId; + + public String getAcquirerId() { + return acquirerId; + } + + public void setAcquirerId(String acquirerId) { + this.acquirerId = acquirerId; + } + + public ExternalTokenProvider getExternalToken() { + return externalToken; + } + + public void setExternalToken(ExternalTokenProvider externalToken) { + this.externalToken = externalToken; + } + public InitPaymentThreeD getThreeD() { return threeD; } From f73115ac7ddae3592c539533093d48e5dcf9d727 Mon Sep 17 00:00:00 2001 From: Radostin Tonev Date: Mon, 21 Aug 2023 13:09:14 +0000 Subject: [PATCH 08/55] Merged PR 55431: #604602 Update account capture request with URL details Update account capture with URL details Related work items: #604602 --- pom.xml | 2 +- .../java/com/safecharge/biz/RequestBuilder.java | 3 ++- .../java/com/safecharge/biz/Safecharge.java | 4 ++-- .../request/AccountCaptureRequest.java | 17 +++++++++++++++++ .../java/com/safecharge/biz/SafechargeTest.java | 4 ++-- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ac0d2d2..2ef704a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.2 + 1.7.3 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index b67f951..35d9b7d 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -338,7 +338,7 @@ public McpRatesRequest getMcpRatesRequest(String sessionToken, MerchantInfo merc public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId, String userTokenId, String paymentMethod, String currencyCode, String countryCode, - String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails) { + String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) { return AccountCaptureRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -352,6 +352,7 @@ public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, Merch .addNotificationUrl(notificationUrl) .addDeviceDetails(deviceDetails) .addUserDetails(userDetails) + .addUrlDetails(urlDetails) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index c175853..7562d03 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -621,12 +621,12 @@ public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestI * @throws SafechargeException */ public AccountCaptureResponse accountCapture(String clientRequestId, String userTokenId, String paymentMethod, String currencyCode, - String countryCode, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails) throws SafechargeException { + String countryCode, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); AccountCaptureRequest request = requestBuilder.getAccountCaptureRequest(sessionToken, merchantInfo, clientRequestId, - userTokenId, paymentMethod, currencyCode, countryCode, languageCode, amount, notificationUrl, deviceDetails, userDetails); + userTokenId, paymentMethod, currencyCode, countryCode, languageCode, amount, notificationUrl, deviceDetails, userDetails, urlDetails); return (AccountCaptureResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/AccountCaptureRequest.java b/src/main/java/com/safecharge/request/AccountCaptureRequest.java index 406db99..0f58eff 100644 --- a/src/main/java/com/safecharge/request/AccountCaptureRequest.java +++ b/src/main/java/com/safecharge/request/AccountCaptureRequest.java @@ -11,6 +11,7 @@ import javax.validation.constraints.Size; import com.safecharge.model.DeviceDetails; +import com.safecharge.model.UrlDetails; import com.safecharge.model.UserDetails; import com.safecharge.request.builder.SafechargeBuilder; import com.safecharge.util.Constants; @@ -50,6 +51,8 @@ public class AccountCaptureRequest extends SafechargeRequest { private UserDetails userDetails; + private UrlDetails urlDetails; + public String getUserTokenId() { return userTokenId; } @@ -122,6 +125,14 @@ public void setNotificationUrl(String notificationUrl) { this.notificationUrl = notificationUrl; } + public UrlDetails getUrlDetails() { + return urlDetails; + } + + public void setUrlDetails(UrlDetails urlDetails) { + this.urlDetails = urlDetails; + } + public static Builder builder() { return new Builder(); } @@ -137,6 +148,7 @@ public static class Builder extends SafechargeBuilder { private String notificationUrl; private DeviceDetails deviceDetails; private UserDetails userDetails; + private UrlDetails urlDetails; public Builder addUserTokenId(String userTokenId) { this.userTokenId = userTokenId; @@ -183,6 +195,10 @@ public Builder addNotificationUrl(String notificationUrl) { return this; } + public Builder addUrlDetails(UrlDetails urlDetails) { + this.urlDetails = urlDetails; + return this; + } @Override public AccountCaptureRequest build() throws ConstraintViolationException { @@ -196,6 +212,7 @@ public AccountCaptureRequest build() throws ConstraintViolationException { request.setNotificationUrl(notificationUrl); request.setDeviceDetails(deviceDetails); request.setUserDetails(userDetails); + request.setUrlDetails(urlDetails); return ValidationUtils.validate(super.build(request)); } diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index a3b5f0d..a23418d 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -485,7 +485,7 @@ public void shouldExecuteAccountCaptureRequestAndReturnResponse() throws Safecha sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); AccountCaptureResponse response = sut.accountCapture("clientRequestId", "userTokenId", "paymentMethod", "BGN", "BG", - "BG", null, null, null, null); + "BG", null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(AccountCaptureRequest.class)); @@ -501,7 +501,7 @@ public void shouldThrowExceptionWhenAccountCaptureRequestIsExecutedWithoutInitia exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.accountCapture("clientRequestId", "userTokenId", "paymentMethod", "BGN", "BG", - null, null,null, null, null); + null, null,null, null, null, null); } @Test From 0c2e81dec1d8e39701e6d7812e7cbbd2a986774a Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Fri, 1 Sep 2023 14:05:39 +0300 Subject: [PATCH 09/55] Update account capture with URL details --- .../java/com/safecharge/biz/Safecharge.java | 2 ++ .../java/com/safecharge/model/UrlDetails.java | 22 +++++++++++++++++++ .../response/AccountCaptureResponse.java | 9 ++++++++ .../Authorize3dAndPaymentResponse.java | 13 ++++++++++- 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 7562d03..f201cf4 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -617,6 +617,8 @@ public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestI * @param notificationUrl The URL to which DMNs are sent (see our DMNs Guide). * @param deviceDetails Information about client device * @param userDetails Holder for user details. + * @param urlDetails Although DMN responses can be configured per merchant site, it allows dynamically returning the + * DMN to the provided address per request. * @return Passes through the response from Safecharge's REST API. * @throws SafechargeException */ diff --git a/src/main/java/com/safecharge/model/UrlDetails.java b/src/main/java/com/safecharge/model/UrlDetails.java index a208ec1..66a5f41 100644 --- a/src/main/java/com/safecharge/model/UrlDetails.java +++ b/src/main/java/com/safecharge/model/UrlDetails.java @@ -35,6 +35,12 @@ public class UrlDetails { @Size(max = 1000, message = "backUrl size must be up to 1000 characters long!") private String backUrl; + @Size(max = 1000, message = "appUrl size must be up to 1000 characters long!") + private String appUrl; + + @Size(max = 1000, message = "appReturnLink size must be up to 1000 characters long!") + private String appReturnLink; + public String getSuccessUrl() { return successUrl; } @@ -74,4 +80,20 @@ public String getBackUrl() { public void setBackUrl(String backUrl) { this.backUrl = backUrl; } + + public String getAppUrl() { + return appUrl; + } + + public void setAppUrl(String appUrl) { + this.appUrl = appUrl; + } + + public String getAppReturnLink() { + return appReturnLink; + } + + public void setAppReturnLink(String appReturnLink) { + this.appReturnLink = appReturnLink; + } } \ No newline at end of file diff --git a/src/main/java/com/safecharge/response/AccountCaptureResponse.java b/src/main/java/com/safecharge/response/AccountCaptureResponse.java index 056fec9..dfcb3a7 100644 --- a/src/main/java/com/safecharge/response/AccountCaptureResponse.java +++ b/src/main/java/com/safecharge/response/AccountCaptureResponse.java @@ -18,6 +18,7 @@ public class AccountCaptureResponse extends SafechargeResponse { private String redirectUrl; private String userTokenId; + private String openInExternalBrowser; public String getRedirectUrl() { return redirectUrl; @@ -34,4 +35,12 @@ public String getUserTokenId() { public void setUserTokenId(String userTokenId) { this.userTokenId = userTokenId; } + + public String getOpenInExternalBrowser() { + return openInExternalBrowser; + } + + public void setOpenInExternalBrowser(String openInExternalBrowser) { + this.openInExternalBrowser = openInExternalBrowser; + } } diff --git a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java index e0e18bc..00ac7db 100644 --- a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java @@ -53,6 +53,8 @@ public abstract class Authorize3dAndPaymentResponse extends SafechargeResponse { private String additionalTransactionBankId; + private String openInExternalBrowser; + public String getOrderId() { return orderId; } @@ -221,6 +223,14 @@ public void setAdditionalTransactionBankId(String additionalTransactionBankId) { this.additionalTransactionBankId = additionalTransactionBankId; } + public String getOpenInExternalBrowser() { + return openInExternalBrowser; + } + + public void setOpenInExternalBrowser(String openInExternalBrowser) { + this.openInExternalBrowser = openInExternalBrowser; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -245,7 +255,8 @@ public String toString() { .append(", issuerDeclineReason=").append(issuerDeclineReason) .append(", externalSchemeTransactionId=").append(externalSchemeTransactionId) .append(", additionalTransactionBankId=").append(additionalTransactionBankId) - .append(", partialApproval=").append(partialApproval); + .append(", partialApproval=").append(partialApproval) + .append(", openInExternalBrowser=").append(openInExternalBrowser); return sb.toString(); } From 3325ff59eb1cab13b7c18a69097271ca07af04b2 Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Fri, 1 Sep 2023 15:45:34 +0300 Subject: [PATCH 10/55] Expose getMerchantPaymentMethods method --- .../com/safecharge/biz/RequestBuilder.java | 12 ++++++++++ .../java/com/safecharge/biz/Safecharge.java | 22 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 35d9b7d..3d66a6f 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -389,4 +389,16 @@ public SafechargeBaseRequest getAddUpoApmRequest(String sessionToken, MerchantIn .addApmData(apmData) .build(); } + + public SafechargeBaseRequest getGetMerchantPaymentMethodsRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) { + return GetMerchantPaymentMethodsRequest.builder() + .addSessionToken(sessionToken) + .addMerchantInfo(merchantInfo) + .addClientRequestId(clientRequestId) + .addCountryCode(countryCode) + .addCurrencyCode(currencyCode) + .addLanguageCode(languageCode) + .addType(type) + .build(); + } } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index f201cf4..f267140 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -707,4 +707,26 @@ public GetPayoutStatusResponse getPayoutStatus(String clientRequestId) throws Sa return (GetPayoutStatusResponse) requestExecutor.execute(request); } + + /** + * Allows the merchant view the names, IDs and other information regarding the enabled payment methods, + * which may be filtered based on country, currency and language. + * + * @param clientRequestId ID of the API request in merchant system. + * @param currencyCode The three character ISO currency code. + * @param countryCode The country the transaction is to be completed in. + * @param languageCode The language the transaction is to be completed in. + * @param type Will determain which type of payment methods will be returned. Possible values: DEPOSIT, WITHDRAWAL. + * @return + * @throws SafechargeException + */ + public GetMerchantPaymentMethodsResponse getMerchantPaymentMethods(String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) throws SafechargeException { + ensureMerchantInfoAndSessionTokenNotNull(); + + RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); + SafechargeBaseRequest request = requestBuilder.getGetMerchantPaymentMethodsRequest(sessionToken, merchantInfo, + clientRequestId, currencyCode, countryCode, languageCode, type); + + return (GetMerchantPaymentMethodsResponse) requestExecutor.execute(request); + } } From b1a267ff404c0a0c3406e6825b4bb89d068c4444 Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Fri, 1 Sep 2023 16:01:11 +0300 Subject: [PATCH 11/55] Add additional fields for GetMerchantPaymentMethodsResponse --- .../com/safecharge/model/PaymentMethod.java | 12 ++++++++++ .../GetMerchantPaymentMethodsResponse.java | 24 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/main/java/com/safecharge/model/PaymentMethod.java b/src/main/java/com/safecharge/model/PaymentMethod.java index 110e8b0..108b861 100644 --- a/src/main/java/com/safecharge/model/PaymentMethod.java +++ b/src/main/java/com/safecharge/model/PaymentMethod.java @@ -30,6 +30,8 @@ public class PaymentMethod { private List fields; + private String openInExternalBrowser; + public String getPaymentMethod() { return paymentMethod; } @@ -86,6 +88,14 @@ public void setFields(List fields) { this.fields = fields; } + public String getOpenInExternalBrowser() { + return openInExternalBrowser; + } + + public void setOpenInExternalBrowser(String openInExternalBrowser) { + this.openInExternalBrowser = openInExternalBrowser; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PaymentMethod{"); @@ -104,6 +114,8 @@ public String toString() { .append('\''); sb.append(", paymentMethodDisplayName=") .append(paymentMethodDisplayName); + sb.append(", openInExternalBrowser=") + .append(openInExternalBrowser); sb.append(", fields=") .append(fields); sb.append('}'); diff --git a/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java b/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java index b538d6c..2e5efe3 100644 --- a/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java +++ b/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java @@ -22,6 +22,8 @@ public class GetMerchantPaymentMethodsResponse extends SafechargeResponse { * List of {@link PaymentMethod} objects containing the available payment options per the GetMerchantPaymentMethodsRequest */ private List paymentMethods; + private String type; + private String countryCode; public List getPaymentMethods() { return paymentMethods; @@ -31,11 +33,33 @@ public void setPaymentMethods(List paymentMethods) { this.paymentMethods = paymentMethods; } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getCountryCode() { + return countryCode; + } + + public void setCountryCode(String countryCode) { + this.countryCode = countryCode; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("GetMerchantPaymentMethodsResponse{"); sb.append("paymentMethods=") .append(paymentMethods); + sb.append(", "); + sb.append("type=") + .append(type); + sb.append(", "); + sb.append("countryCode=") + .append(countryCode); sb.append(", ") .append(super.toString()); sb.append('}'); From a33b440a94a68fb6d30da657197bee84d043de3d Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Thu, 14 Sep 2023 11:22:52 +0300 Subject: [PATCH 12/55] Update Readme.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 77146c4..ff09f43 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.3 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.3 org.apache.bval From 8d6fdba54dfccd8441d398b3b06a07935f769bbd Mon Sep 17 00:00:00 2001 From: Nurhan Mustafa Date: Thu, 21 Sep 2023 06:45:16 +0000 Subject: [PATCH 13/55] Merged PR 58089: #582426- Columbia Fields - AddendumsLocalPayment extended with new fields #582426- Columbia Fields - AddendumsLocalPayment extended with new fields Related work items: #582426 --- .../model/AddendumsLocalPayment.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/main/java/com/safecharge/model/AddendumsLocalPayment.java b/src/main/java/com/safecharge/model/AddendumsLocalPayment.java index 701cbf7..db6caf1 100644 --- a/src/main/java/com/safecharge/model/AddendumsLocalPayment.java +++ b/src/main/java/com/safecharge/model/AddendumsLocalPayment.java @@ -31,6 +31,24 @@ public class AddendumsLocalPayment { @Size(max = 255) private String numberOfInstallments; + @Size(max = 12) + private String vatAmount; + + @Size(max = 12) + private String nationalConsumptionTaxAmount; + + @Size(max = 12) + private String taxAmountBase; + + @Size(max = 12) + private String tipAmount; + + @Size(max = 3) + private String taxCurrencyCodeBase; + + @Size(max = 12) + private String airportChargeAmount; + public String getNationalId() { return nationalId; } @@ -70,4 +88,52 @@ public String getNumberOfInstallments() { public void setNumberOfInstallments(String numberOfInstallments) { this.numberOfInstallments = numberOfInstallments; } + + public String getVatAmount() { + return vatAmount; + } + + public void setVatAmount(String vatAmount) { + this.vatAmount = vatAmount; + } + + public String getNationalConsumptionTaxAmount() { + return nationalConsumptionTaxAmount; + } + + public void setNationalConsumptionTaxAmount(String nationalConsumptionTaxAmount) { + this.nationalConsumptionTaxAmount = nationalConsumptionTaxAmount; + } + + public String getTaxAmountBase() { + return taxAmountBase; + } + + public void setTaxAmountBase(String taxAmountBase) { + this.taxAmountBase = taxAmountBase; + } + + public String getTipAmount() { + return tipAmount; + } + + public void setTipAmount(String tipAmount) { + this.tipAmount = tipAmount; + } + + public String getTaxCurrencyCodeBase() { + return taxCurrencyCodeBase; + } + + public void setTaxCurrencyCodeBase(String taxCurrencyCodeBase) { + this.taxCurrencyCodeBase = taxCurrencyCodeBase; + } + + public String getAirportChargeAmount() { + return airportChargeAmount; + } + + public void setAirportChargeAmount(String airportChargeAmount) { + this.airportChargeAmount = airportChargeAmount; + } } From 091f8b7220dcc33122cf86ea41a0400e2c5ba459 Mon Sep 17 00:00:00 2001 From: Asen Haralambov Date: Thu, 21 Sep 2023 15:35:59 +0000 Subject: [PATCH 14/55] Merged PR 57546: 625794 - Add addressLines and shipAddressLines in UserAddress DTO 625794 - Add addressLines and shipAddressLines in UserAddress DTO Related work items: #624435, #625794 --- pom.xml | 25 +--- .../com/safecharge/model/UserAddress.java | 47 +++++++- .../AddUPOCreditCardByTempTokenRequest.java | 29 +++++ .../request/CardTokenizationRequest.java | 30 +++++ .../request/CreateSubscriptionRequest.java | 30 +++++ .../builder/SafechargeBaseOrderBuilder.java | 60 ++++++++++ .../builder/SafechargeOrderBuilder.java | 58 ++++++++++ .../com/safecharge/util/APIConstants.java | 1 + .../com/safecharge/util/AddressUtils.java | 33 +++++- .../com/safecharge/test/ValidationsTest.java | 108 ++++++++++++++++++ 10 files changed, 395 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 2ef704a..0f594d3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.3 + 1.7.4-SNAPSHOT Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, @@ -73,28 +73,7 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - ${gpg.keyname} - - --pinentry-mode - loopback - - - - - + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/java/com/safecharge/model/UserAddress.java b/src/main/java/com/safecharge/model/UserAddress.java index 95b9851..87f506a 100644 --- a/src/main/java/com/safecharge/model/UserAddress.java +++ b/src/main/java/com/safecharge/model/UserAddress.java @@ -4,7 +4,6 @@ package com.safecharge.model; -import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import com.safecharge.util.APIConstants; @@ -45,7 +44,7 @@ public class UserAddress { /** * The address of the recipient */ - @Size(max = APIConstants.ADDRESS_MAX_LENGTH, message = "address size must be up to 60 characters long!") + @Size(max = APIConstants.ADDRESS_MAX_LENGTH, message = "address size must be up to 120 characters long!") private String address; /** @@ -84,6 +83,18 @@ public class UserAddress { @Size(max = APIConstants.COUNTY_MAX_LENGTH, message = "county size must be up to 255 characters long!") private String county; + @Size(max = APIConstants.ADDRESS_LINE_MAX_LENGTH, message = "shipAddressLine2 size must be up to 60 characters long!") + private String shipAddressLine2; + + @Size(max = APIConstants.ADDRESS_LINE_MAX_LENGTH, message = "shipAddressLine3 size must be up to 60 characters long!") + private String shipAddressLine3; + + @Size(max = APIConstants.ADDRESS_LINE_MAX_LENGTH, message = "addressLine2 size must be up to 60 characters long!") + private String addressLine2; + + @Size(max = APIConstants.ADDRESS_LINE_MAX_LENGTH, message = "addressLine3 size must be up to 60 characters long!") + private String addressLine3; + public String getAddress() { return address; } @@ -171,4 +182,36 @@ public String getCounty() { public void setCounty(String county) { this.county = county; } + + public String getShipAddressLine2() { + return shipAddressLine2; + } + + public void setShipAddressLine2(String shipAddressLine2) { + this.shipAddressLine2 = shipAddressLine2; + } + + public String getShipAddressLine3() { + return shipAddressLine3; + } + + public void setShipAddressLine3(String shipAddressLine3) { + this.shipAddressLine3 = shipAddressLine3; + } + + public String getAddressLine2() { + return addressLine2; + } + + public void setAddressLine2(String addressLine2) { + this.addressLine2 = addressLine2; + } + + public String getAddressLine3() { + return addressLine3; + } + + public void setAddressLine3(String addressLine3) { + this.addressLine3 = addressLine3; + } } diff --git a/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java b/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java index 6928651..cff2cab 100644 --- a/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java +++ b/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java @@ -152,6 +152,35 @@ public Builder addBillingAddress(String firstName, String lastName, String email return addBillingAddress(billingAddress); } + /** + * Adds billing info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public Builder addBillingAddress(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress billingAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addBillingAddress(billingAddress); + } + /** * Adds billing address data to the request. * diff --git a/src/main/java/com/safecharge/request/CardTokenizationRequest.java b/src/main/java/com/safecharge/request/CardTokenizationRequest.java index 5f30fbe..ad8572b 100644 --- a/src/main/java/com/safecharge/request/CardTokenizationRequest.java +++ b/src/main/java/com/safecharge/request/CardTokenizationRequest.java @@ -199,6 +199,36 @@ public Builder addBillingAddress(String firstName, String lastName, String email return addBillingAddress(billingAddress); } + /** + * Adds billing info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param county The county of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public Builder addBillingAddress(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress billingAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addBillingAddress(billingAddress); + } + /** * Adds billing info to the request. * diff --git a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java b/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java index 150e0ad..5712864 100644 --- a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java +++ b/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java @@ -490,6 +490,36 @@ public Builder addBillingAddress(String firstName, String lastName, String email return addBillingAddress(billingAddress); } + /** + * Adds billing info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param county The county of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public Builder addBillingAddress(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress billingAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, city, country, + state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addBillingAddress(billingAddress); + } + /** * Adds billing info to the request. * diff --git a/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java index efdb628..edb36d5 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java @@ -179,6 +179,36 @@ public T addShippingDetails(UserAddress userAddress) { return (T) this; } + /** + * Adds shipping info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param county The county of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public T addShippingDetails(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress userAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addShippingDetails(userAddress); + } + /** * Adds shipping info to the request. * @@ -241,6 +271,36 @@ public T addBillingDetails(String firstName, String lastName, String email, Stri return addBillingDetails(userAddress); } + /** + * Adds billing info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param county The county of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public T addBillingDetails(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress userAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addBillingDetails(userAddress); + } + /** * Adds Merchant's dynamic data to the request. * diff --git a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java index d961391..858a558 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java @@ -209,6 +209,35 @@ public T addShippingDetails(String firstName, String lastName, String email, Str return addShippingDetails(userAddress); } + /** + * Adds shipping info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public T addShippingDetails(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress userAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addShippingDetails(userAddress); + } + /** * Adds billing info to the request. * @@ -245,6 +274,35 @@ public T addBillingDetails(String firstName, String lastName, String email, Stri return addBillingDetails(userAddress); } + /** + * Adds billing info to the request. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return this object + */ + public T addBillingDetails(String firstName, String lastName, String email, String phone, String address, String city, String country, + String state, String zip, String cell, String county, String addressLine2, String addressLine3, String shipAddressLine2, + String shipAddressLine3) { + + UserAddress userAddress = AddressUtils.createUserAddressFromParams(firstName, lastName, email, phone, address, + city, country, state, zip, cell, county, addressLine2, addressLine3, shipAddressLine2, shipAddressLine3); + + return addBillingDetails(userAddress); + } + /** * Adds Merchant's dynamic data to the request. * diff --git a/src/main/java/com/safecharge/util/APIConstants.java b/src/main/java/com/safecharge/util/APIConstants.java index 44a7470..15e8d06 100644 --- a/src/main/java/com/safecharge/util/APIConstants.java +++ b/src/main/java/com/safecharge/util/APIConstants.java @@ -91,6 +91,7 @@ public String getUrl() { // Field limitations: short ADDRESS_MAX_LENGTH = 120; + short ADDRESS_LINE_MAX_LENGTH = 60; short FIRST_NAME_MAX_LENGTH = 30; short LAST_NAME_MAX_LENGTH = 40; short CARD_HOLDER_MAX_LENGTH = 70; diff --git a/src/main/java/com/safecharge/util/AddressUtils.java b/src/main/java/com/safecharge/util/AddressUtils.java index 06bad31..46f5e51 100644 --- a/src/main/java/com/safecharge/util/AddressUtils.java +++ b/src/main/java/com/safecharge/util/AddressUtils.java @@ -36,7 +36,6 @@ private AddressUtils() { */ public static UserAddress createUserAddressFromParams(String firstName, String lastName, String email, String phone, String address, String city, String country, String state, String zip, String cell, String county) { - UserAddress userAddress = new UserAddress(); userAddress.setFirstName(firstName); userAddress.setLastName(lastName); @@ -53,6 +52,38 @@ public static UserAddress createUserAddressFromParams(String firstName, String l return userAddress; } + /** + * Static factory method to create new {@link UserAddress} object based on the passed params. + * + * @param firstName The first name of the recipient + * @param lastName The last name of the recipient + * @param email The email of the recipient + * @param phone The phone number of the recipient + * @param address The address of the recipient + * @param city The city of the recipient + * @param country The country of the recipient(two-letter ISO country code) + * @param state The state of the recipient(two-letter ISO state code) + * @param zip The postal code of the recipient + * @param cell The cell number of the recipient + * @param addressLine2 The address line 2 of the recipient's address + * @param addressLine3 The address line 3 of the recipient's address + * @param shipAddressLine2 The shipping address line 2 of the recipient's address + * @param shipAddressLine3 The shipping address line 3 of the recipient's address + * @return new {@link UserAddress} object created from the passed params + */ + public static UserAddress createUserAddressFromParams(String firstName, String lastName, String email, String phone, String address, String city, + String country, String state, String zip, String cell, String county, String addressLine2, String addressLine3, + String shipAddressLine2, String shipAddressLine3) { + + UserAddress userAddress = createUserAddressFromParams(firstName, lastName, email, phone, address, city, country, state, zip, cell, county); + userAddress.setAddressLine2(addressLine2); + userAddress.setAddressLine3(addressLine3); + userAddress.setShipAddressLine2(shipAddressLine2); + userAddress.setShipAddressLine3(shipAddressLine3); + + return userAddress; + } + /** * Static factory method to create new {@link UserDetails} object based on the passed params. * diff --git a/src/test/java/com/safecharge/test/ValidationsTest.java b/src/test/java/com/safecharge/test/ValidationsTest.java index f72c2e7..06b67b9 100644 --- a/src/test/java/com/safecharge/test/ValidationsTest.java +++ b/src/test/java/com/safecharge/test/ValidationsTest.java @@ -4,9 +4,13 @@ package com.safecharge.test; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Set; +import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import org.junit.Before; @@ -172,6 +176,15 @@ public class ValidationsTest { "Sofia", "BG", null, "1000", "0884123456", "county billing"); private static final UserAddress dummyValidShippingDetails = dummyValidBillingDetails; //shipping address same as billing address + private static final UserAddress dummyValidBillingDetailsWithAddressLines = + AddressUtils.createUserAddressFromParams("Test", "Testov", "test@test.com", "0884123456", "Test street 1", + "Sofia", "BG", null, "1000", "0884123456", "county billing", + "address line 2", "address line 3", null, null); + + private static final UserAddress dummyValidShippingDetailsWithAddressLines = AddressUtils.createUserAddressFromParams("Test", "Testov", "test@test.com", "0884123456", "Test street 1", + "Sofia", "BG", null, "1000", "0884123456", "county billing", + null, null, "shipping address line 2", "shipping address line 3"); + private static final UserAddress dummyInvalidBillingDetails = AddressUtils.createUserAddressFromParams("Test Long Name that should fail the validation! Test Long Name that should fail the validation!", "Test Long Name that should fail the validation! Test Long Name that should fail the validation! Test Long Name that should fail the validation!", @@ -179,6 +192,17 @@ public class ValidationsTest { "Sofia", "BG", null, "1000", "0884123456", "county bil 1"); private static final UserAddress dummyInvalidShippingDetails = dummyInvalidBillingDetails; //shipping address same as billing address + private static final UserAddress dummyInvalidBillingDetailsWithLongAddressLines = + AddressUtils.createUserAddressFromParams("Test", "Testov", "test@test.com", "0884123456", "Test street 1", + "Sofia", "BG", null, "1000", "0884123456", "county billing", + "1234567890123456789012345678901234567890123456789012345678901", "1234567890123456789012345678901234567890123456789012345678901", null, null); + + private static final UserAddress dummyInvalidShippingDetailsWithLongAddressLines = + AddressUtils.createUserAddressFromParams("Test", "Testov", "test@test.com", "0884123456", "Test street 1", + "Sofia", "BG", null, "1000", "0884123456", "county billing", + null , null, "1234567890123456789012345678901234567890123456789012345678901", "1234567890123456789012345678901234567890123456789012345678901"); + + private static final UrlDetails dummyValidUrlDetails = UrlUtils.createUrlDetails("https://apmtest.gate2shop.com/nikolappp/cashier/cancel.do", "https://apmtest.gate2shop.com/nikolappp/defaultPending.do", "https://apmtest.gate2shop.com/nikolappp/defaultSuccess.do", null); @@ -619,6 +643,90 @@ public void testSuccessfulValidation_PaymentAPMRequest() { assertTrue(safechargeRequest != null); } + @Test + public void testSuccessfulValidation_withAddressLines_PaymentAPMRequest() { + SafechargeBaseRequest safechargeRequest = PaymentAPMRequest.builder() + .addMerchantInfo(validMerchantInfo) + .addCurrency(validCurrencyCode) + .addAmount(validAmountTwoItems) + .addSessionToken(dummySessionToken) + .addItem(dummyValidItem) + .addItem(dummyValidItem2) + .addUserDetails(dummyValidRestApiUserDetails) + .addBillingDetails(dummyValidBillingDetailsWithAddressLines) + .addShippingDetails(dummyValidShippingDetailsWithAddressLines) + .addOrderId(dummyOrderId) + .addURLDetails(dummyValidUrlDetails) + .addPaymentMethod(validPaymentMethodName) + .build(); + assertTrue(safechargeRequest != null); + } + + @Test + public void testFailedValidation_withLongBillingAddressLines_PaymentAPMRequest() { + + try { + PaymentAPMRequest.builder() + .addMerchantInfo(validMerchantInfo) + .addCurrency(validCurrencyCode) + .addAmount(validAmountTwoItems) + .addSessionToken(dummySessionToken) + .addItem(dummyValidItem) + .addItem(dummyValidItem2) + .addUserDetails(dummyValidRestApiUserDetails) + .addBillingDetails(dummyInvalidBillingDetailsWithLongAddressLines) + .addShippingDetails(dummyValidShippingDetailsWithAddressLines) + .addOrderId(dummyOrderId) + .addURLDetails(dummyValidUrlDetails) + .addPaymentMethod(validPaymentMethodName) + .build(); + fail(CONSTRAINT_VIOLATION_EXCEPTION_EXPECTED_BUT_OBJECT_CREATION_PASSED_SUCCESSFULLY); + } catch (ConstraintViolationException e) { + List messages = extractConstraintViolationMessages(e); + assertEquals(2, messages.size()); + assertTrue(messages.contains("addressLine2 size must be up to 60 characters long!")); + assertTrue(messages.contains("addressLine3 size must be up to 60 characters long!")); + } + } + + @Test + public void testFailedValidation_withLongShippingAddressLines_PaymentAPMRequest() { + + try { + PaymentAPMRequest.builder() + .addMerchantInfo(validMerchantInfo) + .addCurrency(validCurrencyCode) + .addAmount(validAmountTwoItems) + .addSessionToken(dummySessionToken) + .addItem(dummyValidItem) + .addItem(dummyValidItem2) + .addUserDetails(dummyValidRestApiUserDetails) + .addBillingDetails(dummyValidBillingDetailsWithAddressLines) + .addShippingDetails(dummyInvalidShippingDetailsWithLongAddressLines) + .addOrderId(dummyOrderId) + .addURLDetails(dummyValidUrlDetails) + .addPaymentMethod(validPaymentMethodName) + .build(); + fail(CONSTRAINT_VIOLATION_EXCEPTION_EXPECTED_BUT_OBJECT_CREATION_PASSED_SUCCESSFULLY); + } catch (ConstraintViolationException e) { + List messages = extractConstraintViolationMessages(e); + assertEquals(2, messages.size()); + assertTrue(messages.contains("shipAddressLine2 size must be up to 60 characters long!")); + assertTrue(messages.contains("shipAddressLine3 size must be up to 60 characters long!")); + } + } + + private List extractConstraintViolationMessages(ConstraintViolationException e) { + List messages = new ArrayList<>(); + Set> constraintViolations = e.getConstraintViolations(); + if (constraintViolations != null) { + for (ConstraintViolation constraintViolation : constraintViolations) { + messages.add(constraintViolation.getMessage()); + } + } + return messages; + } + @Test public void testFailedValidation_PaymentAPMRequest() { From a2e0b9382cf5205cbabbeabb4437f714a43cef0d Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Thu, 28 Sep 2023 06:20:26 +0000 Subject: [PATCH 15/55] Merged PR 58019: Add taxId - MC France Related work items: #598819, #622454 --- .../com/safecharge/biz/RequestBuilder.java | 14 ++++++++---- .../java/com/safecharge/biz/Safecharge.java | 22 +++++++++++-------- .../com/safecharge/model/CompanyDetails.java | 19 ++++++++++++++++ .../request/Authorize3dAndPaymentRequest.java | 18 +++++++++++++++ .../safecharge/request/OpenOrderRequest.java | 21 +++++++++++++++++- .../com/safecharge/request/PayoutRequest.java | 20 +++++++++++++++++ .../request/SafechargeTransactionRequest.java | 13 +++++++++++ .../builder/SafechargeTransactionBuilder.java | 10 +++++++++ .../com/safecharge/biz/SafechargeTest.java | 14 +++++++----- 9 files changed, 131 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/safecharge/model/CompanyDetails.java diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 3d66a6f..88e2406 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -28,7 +28,8 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails) { + String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, + RecipientDetails recipientDetails, CompanyDetails companyDetails) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -67,6 +68,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .addRedirectFlowUITheme(redirectFlowUITheme) .addAftOverride(aftOverride) .addRecipientDetails(recipientDetails) + .addCompanyDetails(companyDetails) .build(); } @@ -101,7 +103,7 @@ public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, Stri String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride) { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails) { return OpenOrderRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -140,6 +142,7 @@ public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, Stri .addCurrencyConversion(currencyConversion) .addOpenAmount(openAmount) .addAftOverride(aftOverride) + .addCompanyDetails(companyDetails) .build(); } @@ -210,7 +213,8 @@ public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, Me public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, - String productId, String relatedTransactionId, SubMerchant subMerchant) { + String productId, String relatedTransactionId, SubMerchant subMerchant, + CompanyDetails companyDetails) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -226,6 +230,7 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me .addProductId(productId) .addRelatedTransactionId(relatedTransactionId) .addSubMerchant(subMerchant) + .addCompanyDetails(companyDetails) .build(); } @@ -359,7 +364,7 @@ public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, Merch public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchantInfo, String userTokenId, String clientUniqueId, String clientRequestId, String amount, String currency, UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, - CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails) { + CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails) { return PayoutRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -376,6 +381,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .addCardData(cardData) .addDeviceDetails(deviceDetails) .addUserDetails(userDetails) + .addCompanyDetails(companyDetails) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index f267140..1275dad 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -117,6 +117,7 @@ private String getSessionToken() throws SafechargeException { * @param redirectFlowUITheme The UI theme of the redirect page shown to the end user during the 3D-Secure payment flow managed by Web SDK. * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". * @param recipientDetails This class is relevant for Visa’s AFTs, and contains the details of the recipient receiving the funding. + * @param companyDetails Holds information about company taxId. * @return Passes through the response from Safecharge's REST API. * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. @@ -129,7 +130,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, - String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails) throws SafechargeException { + String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -137,7 +138,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails); return (PaymentResponse) requestExecutor.execute(request); } @@ -248,7 +249,7 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride) throws SafechargeException { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -256,7 +257,7 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S paymentOption, transactionType, currency, amount, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, urlDetails, userTokenId, clientUniqueId, userPaymentOption, paymentMethod, amountDetails, addendums, customData, autoPayment3D, isMoto, authenticationOnlyType, subMerchant, isRebilling, rebillingType, - preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride); + preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride, companyDetails); return (OpenOrderResponse) requestExecutor.execute(request); } @@ -399,12 +400,14 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String */ public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, - String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant) throws SafechargeException { + String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, + CompanyDetails companyDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, - urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, relatedTransactionId, subMerchant); + SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, + clientRequestId, urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, + relatedTransactionId, subMerchant, companyDetails); return (RefundTransactionResponse) requestExecutor.execute(request); } @@ -658,14 +661,15 @@ public AccountCaptureResponse accountCapture(String clientRequestId, String user public PayoutResponse payout(String userTokenId, String clientUniqueId, String clientRequestId, String amount, String currency, UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, - CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails) throws SafechargeException { + CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails) + throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); PayoutRequest request = requestBuilder.getPayoutRequest(sessionToken, merchantInfo, userTokenId, clientUniqueId, clientRequestId, amount, currency,userPaymentOption, comment, dynamicDescriptor, - merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails); + merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails, companyDetails); return (PayoutResponse) requestExecutor.execute(request); diff --git a/src/main/java/com/safecharge/model/CompanyDetails.java b/src/main/java/com/safecharge/model/CompanyDetails.java new file mode 100644 index 0000000..0846748 --- /dev/null +++ b/src/main/java/com/safecharge/model/CompanyDetails.java @@ -0,0 +1,19 @@ +package com.safecharge.model; + +import javax.validation.constraints.Size; + +public class CompanyDetails { + + @Size(max = 55) + private String taxId; + + public String getTaxId() { + return taxId; + } + + public void setTaxId(String taxId) { + this.taxId = taxId; + } + + +} diff --git a/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java b/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java index ee9fb60..3c60287 100644 --- a/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java +++ b/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java @@ -47,6 +47,9 @@ public abstract class Authorize3dAndPaymentRequest extends SafechargePaymentRequ private RecipientDetails recipientDetails; + private CompanyDetails companyDetails; + + public PaymentOption getPaymentOption() { return paymentOption; } @@ -159,6 +162,14 @@ public void setRecipientDetails(RecipientDetails recipientDetails) { this.recipientDetails = recipientDetails; } + public CompanyDetails getCompanyDetails() { + return companyDetails; + } + + public void setCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + } + public abstract static class Builder> extends SafechargePaymentBuilder { private PaymentOption paymentOption; @@ -175,6 +186,7 @@ public abstract static class Builder> extends SafechargePay private String redirectFlowUITheme; private String aftOverride; private RecipientDetails recipientDetails; + private CompanyDetails companyDetails; public T addPaymentOption(PaymentOption paymentOption) { this.paymentOption = paymentOption; @@ -246,6 +258,11 @@ public T addRecipientDetails(RecipientDetails recipientDetails) { return (T) this; } + public T addCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + return (T) this; + } + protected S build(S request) { request.setPaymentOption(paymentOption); request.setIsRebilling(isRebilling); @@ -261,6 +278,7 @@ protected S build(S request) { request.setRedirectFlowUITheme(redirectFlowUITheme); request.setAftOverride(aftOverride); request.setRecipientDetails(recipientDetails); + request.setCompanyDetails(companyDetails); return super.build(request); } diff --git a/src/main/java/com/safecharge/request/OpenOrderRequest.java b/src/main/java/com/safecharge/request/OpenOrderRequest.java index 3e29e28..53535ea 100644 --- a/src/main/java/com/safecharge/request/OpenOrderRequest.java +++ b/src/main/java/com/safecharge/request/OpenOrderRequest.java @@ -54,6 +54,9 @@ public class OpenOrderRequest extends OrderRequestWithDetails { @Size(max = 1) private String isPartialApproval; + @Valid + private CompanyDetails companyDetails; + public String getCustomSiteName() { return customSiteName; } @@ -82,6 +85,14 @@ public Constants.TransactionType getTransactionType() { return transactionType; } + public CompanyDetails getCompanyDetails() { + return companyDetails; + } + + public void setCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + } + public void setTransactionType(Constants.TransactionType transactionType) { this.transactionType = transactionType; } @@ -151,7 +162,8 @@ public String toString() { .append(", isRebilling=").append(isRebilling) .append(", rebillingType=").append(rebillingType) .append(", preventOverride=").append(preventOverride) - .append(", isPartialApproval=").append(isPartialApproval); + .append(", isPartialApproval=").append(isPartialApproval) + .append(", companyDetails=").append(companyDetails); sb.append('}'); return sb.toString(); } @@ -173,6 +185,7 @@ public static class Builder extends SafechargeOrderWithDetailsBuilder { private CurrencyConversion currencyConversion; private OpenAmount openAmount; private String aftOverride; + private CompanyDetails companyDetails; public Builder addCustomSiteName(String customSiteName) { @@ -249,6 +262,11 @@ public Builder addIsPartialApproval(String isPartialApproval) { this.isPartialApproval = isPartialApproval; return this; } + + public Builder addCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + return this; + } /** * Builds the request. * @@ -272,6 +290,7 @@ public SafechargeBaseRequest build() { request.setCurrencyConversion(currencyConversion); request.setOpenAmount(openAmount); request.setAftOverride(aftOverride); + request.setCompanyDetails(companyDetails); return ValidationUtils.validate(super.build(request)); } diff --git a/src/main/java/com/safecharge/request/PayoutRequest.java b/src/main/java/com/safecharge/request/PayoutRequest.java index 2c686be..bbdb8a0 100644 --- a/src/main/java/com/safecharge/request/PayoutRequest.java +++ b/src/main/java/com/safecharge/request/PayoutRequest.java @@ -8,6 +8,7 @@ import javax.validation.constraints.Size; import com.safecharge.model.CardData; +import com.safecharge.model.CompanyDetails; import com.safecharge.model.DeviceDetails; import com.safecharge.model.DynamicDescriptor; import com.safecharge.model.MerchantDetails; @@ -80,6 +81,9 @@ public class PayoutRequest extends SafechargeRequest { @Valid private UserDetails userDetails; + @Valid + private CompanyDetails companyDetails; + public static PayoutRequest.Builder builder() { return new PayoutRequest.Builder(); } @@ -188,6 +192,14 @@ public void setUserDetails(UserDetails userDetails) { this.userDetails = userDetails; } + public CompanyDetails getCompanyDetails() { + return companyDetails; + } + + public void setCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PayoutRequest{"); @@ -204,6 +216,7 @@ public String toString() { sb.append(", cardData='").append(cardData); sb.append(", deviceDetails='").append(deviceDetails); sb.append(", userDetails='").append(userDetails); + sb.append(", companyDetails='").append(companyDetails); sb.append('}'); return sb.toString(); } @@ -223,6 +236,7 @@ public static class Builder extends SafechargeBuilder { private CardData cardData; private DeviceDetails deviceDetails; private UserDetails userDetails; + private CompanyDetails companyDetails; /** * @param userTokenId @@ -330,6 +344,11 @@ public Builder addUserDetails(UserDetails userDetails) { return this; } + public Builder addCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + return this; + } + /** * Builds the request. * @@ -351,6 +370,7 @@ public PayoutRequest build() { request.setCardData(cardData); request.setDeviceDetails(deviceDetails); request.setUserDetails(userDetails); + request.setCompanyDetails(companyDetails); return ValidationUtils.validate(super.build(request)); } } diff --git a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java index 58c7f7d..66e53a2 100644 --- a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java +++ b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import com.safecharge.model.CompanyDetails; import com.safecharge.model.SubMerchant; import com.safecharge.model.UrlDetails; @@ -74,6 +75,9 @@ public abstract class SafechargeTransactionRequest extends SafechargeRequest { @Valid private SubMerchant subMerchant; + @Valid + private CompanyDetails companyDetails; + public String getAmount() { return amount; } @@ -162,6 +166,14 @@ public void setSubMerchant(SubMerchant subMerchant) { this.subMerchant = subMerchant; } + public CompanyDetails getCompanyDetails() { + return companyDetails; + } + + public void setCompanyDetails(CompanyDetails companyDetails) { + this.companyDetails = companyDetails; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("SafechargeTransactionRequest{"); @@ -176,6 +188,7 @@ public String toString() { sb.append(", productId='").append(productId).append('\''); sb.append(", customData='").append(customData).append('\''); sb.append(", subMerchant='").append(subMerchant).append('\''); + sb.append(", companyDetails='").append(companyDetails).append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java index 84cf8cd..840e2f2 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java @@ -4,6 +4,7 @@ package com.safecharge.request.builder; +import com.safecharge.model.CompanyDetails; import com.safecharge.model.SubMerchant; import com.safecharge.model.UrlDetails; import com.safecharge.request.SafechargeTransactionRequest; @@ -34,6 +35,7 @@ public abstract class SafechargeTransactionBuilder S build(S safechargeTransacti safechargeTransactionRequest.setChecksum( ChecksumUtils.calculateChecksum(safechargeTransactionRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); + safechargeTransactionRequest.setCompanyDetails(companyDetails); return safechargeTransactionRequest; } diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index a23418d..918721a 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -112,7 +112,8 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeExce sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); PaymentResponse response = sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(PaymentRequest.class)); @@ -129,7 +130,8 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null); } @Test @@ -176,7 +178,7 @@ public void shouldExecuteOpenOrderRequestAndReturnResponse() throws SafechargeEx sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); OpenOrderResponse response = sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(OpenOrderRequest.class)); @@ -193,7 +195,7 @@ public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeR sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null, null, null, null, null); } @Test @@ -299,7 +301,7 @@ public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws Safe sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); RefundTransactionResponse response = sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactionId", null); + null, null, null, "relatedTransactionId", null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -315,7 +317,7 @@ public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutIni exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactionId", null); + null, null, null, "relatedTransactionId", null, null); } @Test From 899c744c05d70b02447c819c399007f95c539bf9 Mon Sep 17 00:00:00 2001 From: Nurhan Mustafa Date: Thu, 28 Sep 2023 06:21:18 +0000 Subject: [PATCH 16/55] Merged PR 58296: #624390 - merchantAdviceCode added #624390 - merchantAdviceCode added Related work items: #624390, #624556 --- .../response/Authorize3dAndPaymentResponse.java | 13 ++++++++++++- .../com/safecharge/response/PayoutResponse.java | 11 +++++++++++ .../response/RefundTransactionResponse.java | 11 +++++++++++ .../response/SafechargeTransactionResponse.java | 3 +++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java index 00ac7db..a5362b3 100644 --- a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java @@ -55,6 +55,8 @@ public abstract class Authorize3dAndPaymentResponse extends SafechargeResponse { private String openInExternalBrowser; + private String merchantAdviceCode; + public String getOrderId() { return orderId; } @@ -231,6 +233,14 @@ public void setOpenInExternalBrowser(String openInExternalBrowser) { this.openInExternalBrowser = openInExternalBrowser; } + public String getMerchantAdviceCode() { + return merchantAdviceCode; + } + + public void setMerchantAdviceCode(String merchantAdviceCode) { + this.merchantAdviceCode = merchantAdviceCode; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -256,7 +266,8 @@ public String toString() { .append(", externalSchemeTransactionId=").append(externalSchemeTransactionId) .append(", additionalTransactionBankId=").append(additionalTransactionBankId) .append(", partialApproval=").append(partialApproval) - .append(", openInExternalBrowser=").append(openInExternalBrowser); + .append(", openInExternalBrowser=").append(openInExternalBrowser) + .append(", merchantAdviceCode=").append(merchantAdviceCode); return sb.toString(); } diff --git a/src/main/java/com/safecharge/response/PayoutResponse.java b/src/main/java/com/safecharge/response/PayoutResponse.java index 2614291..d2f693c 100644 --- a/src/main/java/com/safecharge/response/PayoutResponse.java +++ b/src/main/java/com/safecharge/response/PayoutResponse.java @@ -34,6 +34,8 @@ public class PayoutResponse extends SafechargeResponse { private String additionalTransactionBankId; + private String merchantAdviceCode; + public String getUserTokenId() { return userTokenId; } @@ -138,6 +140,14 @@ public void setAdditionalTransactionBankId(String additionalTransactionBankId) { this.additionalTransactionBankId = additionalTransactionBankId; } + public String getMerchantAdviceCode() { + return merchantAdviceCode; + } + + public void setMerchantAdviceCode(String merchantAdviceCode) { + this.merchantAdviceCode = merchantAdviceCode; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PayoutResponse{"); @@ -155,6 +165,7 @@ public String toString() { sb.append(", cardData='").append(cardData).append('\''); sb.append(", merchantDetails=").append(merchantDetails); sb.append(", additionalTransactionBankId='").append(additionalTransactionBankId).append('\''); + sb.append(", merchantAdviceCode='").append(merchantAdviceCode).append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/safecharge/response/RefundTransactionResponse.java b/src/main/java/com/safecharge/response/RefundTransactionResponse.java index f4a35ca..abb3fd7 100644 --- a/src/main/java/com/safecharge/response/RefundTransactionResponse.java +++ b/src/main/java/com/safecharge/response/RefundTransactionResponse.java @@ -14,9 +14,20 @@ */ public class RefundTransactionResponse extends SafechargeTransactionResponse { + private String merchantAdviceCode; + + public String getMerchantAdviceCode() { + return merchantAdviceCode; + } + + public void setMerchantAdviceCode(String merchantAdviceCode) { + this.merchantAdviceCode = merchantAdviceCode; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("RefundTransactionResponse{"); + sb.append("merchantAdviceCode='").append(merchantAdviceCode).append("\',"); sb.append(super.toString()); sb.append('}'); return sb.toString(); diff --git a/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java b/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java index 3dbd75b..9068027 100644 --- a/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java +++ b/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java @@ -149,6 +149,7 @@ public abstract class SafechargeTransactionResponse extends SafechargeResponse { private String isExemptionRequestInAuthentication; private String challengePreferenceReason; + public String getTransactionId() { return transactionId; } @@ -589,6 +590,8 @@ public void setChallengePreferenceReason(String challengePreferenceReason) { this.challengePreferenceReason = challengePreferenceReason; } + + @Override public String toString() { final StringBuilder sb = new StringBuilder(); From 578a6626add2cfa8366f6db6dd8c5ecf8b83e5ff Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Thu, 28 Sep 2023 06:52:38 +0000 Subject: [PATCH 17/55] Merged PR 58542: pbi/be-629557 Add AFT indicator in /payment response Related work items: #629557 --- .../response/Authorize3dAndPaymentResponse.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java index a5362b3..8492275 100644 --- a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java @@ -57,6 +57,8 @@ public abstract class Authorize3dAndPaymentResponse extends SafechargeResponse { private String merchantAdviceCode; + private String isAFT; + public String getOrderId() { return orderId; } @@ -241,6 +243,14 @@ public void setMerchantAdviceCode(String merchantAdviceCode) { this.merchantAdviceCode = merchantAdviceCode; } + public String getIsAFT() { + return isAFT; + } + + public void setIsAFT(String isAFT) { + this.isAFT = isAFT; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -267,7 +277,9 @@ public String toString() { .append(", additionalTransactionBankId=").append(additionalTransactionBankId) .append(", partialApproval=").append(partialApproval) .append(", openInExternalBrowser=").append(openInExternalBrowser) - .append(", merchantAdviceCode=").append(merchantAdviceCode); + .append(", merchantAdviceCode=").append(merchantAdviceCode) + .append(", openInExternalBrowser=").append(openInExternalBrowser) + .append(", isAFT=").append(isAFT); return sb.toString(); } From 3e1244c5660e58f17cb8d4472dbf196c041d18ed Mon Sep 17 00:00:00 2001 From: Asen Haralambov Date: Thu, 28 Sep 2023 14:58:12 +0300 Subject: [PATCH 18/55] 634879 - Add CurrencyConversion support for payout request --- .../com/safecharge/biz/RequestBuilder.java | 4 +++- .../java/com/safecharge/biz/Safecharge.java | 8 ++++--- .../com/safecharge/request/PayoutRequest.java | 24 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 88e2406..b13ac73 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -364,7 +364,8 @@ public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, Merch public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchantInfo, String userTokenId, String clientUniqueId, String clientRequestId, String amount, String currency, UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, - CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails) { + CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, + CurrencyConversion currencyConversion) { return PayoutRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -382,6 +383,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .addDeviceDetails(deviceDetails) .addUserDetails(userDetails) .addCompanyDetails(companyDetails) + .addCurrencyConversion(currencyConversion) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 1275dad..ee0bd13 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -655,13 +655,15 @@ public AccountCaptureResponse accountCapture(String clientRequestId, String user * @param subMethodDetails Details about submethod * @param cardData An alternative to sending the userPaymentOptionId for card payouts. * @param deviceDetails Information about client device + * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. * @return Passes through the response from Safecharge's REST API. * @throws SafechargeException */ public PayoutResponse payout(String userTokenId, String clientUniqueId, String clientRequestId, String amount, String currency, UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, - CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails) + CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, + CurrencyConversion currencyConversion) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); @@ -669,8 +671,8 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); PayoutRequest request = requestBuilder.getPayoutRequest(sessionToken, merchantInfo, userTokenId, clientUniqueId, clientRequestId, amount, currency,userPaymentOption, comment, dynamicDescriptor, - merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails, companyDetails); - + merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails, companyDetails, + currencyConversion); return (PayoutResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/PayoutRequest.java b/src/main/java/com/safecharge/request/PayoutRequest.java index bbdb8a0..b062d93 100644 --- a/src/main/java/com/safecharge/request/PayoutRequest.java +++ b/src/main/java/com/safecharge/request/PayoutRequest.java @@ -9,6 +9,7 @@ import com.safecharge.model.CardData; import com.safecharge.model.CompanyDetails; +import com.safecharge.model.CurrencyConversion; import com.safecharge.model.DeviceDetails; import com.safecharge.model.DynamicDescriptor; import com.safecharge.model.MerchantDetails; @@ -84,6 +85,9 @@ public class PayoutRequest extends SafechargeRequest { @Valid private CompanyDetails companyDetails; + @Valid + private CurrencyConversion currencyConversion; + public static PayoutRequest.Builder builder() { return new PayoutRequest.Builder(); } @@ -200,6 +204,14 @@ public void setCompanyDetails(CompanyDetails companyDetails) { this.companyDetails = companyDetails; } + public CurrencyConversion getCurrencyConversion() { + return currencyConversion; + } + + public void setCurrencyConversion(CurrencyConversion currencyConversion) { + this.currencyConversion = currencyConversion; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PayoutRequest{"); @@ -217,6 +229,7 @@ public String toString() { sb.append(", deviceDetails='").append(deviceDetails); sb.append(", userDetails='").append(userDetails); sb.append(", companyDetails='").append(companyDetails); + sb.append(", currencyConversion='").append(currencyConversion); sb.append('}'); return sb.toString(); } @@ -237,6 +250,7 @@ public static class Builder extends SafechargeBuilder { private DeviceDetails deviceDetails; private UserDetails userDetails; private CompanyDetails companyDetails; + private CurrencyConversion currencyConversion; /** * @param userTokenId @@ -349,6 +363,15 @@ public Builder addCompanyDetails(CompanyDetails companyDetails) { return this; } + /** + * @param currencyConversion + * @return this object + */ + public Builder addCurrencyConversion(CurrencyConversion currencyConversion) { + this.currencyConversion = currencyConversion; + return this; + } + /** * Builds the request. * @@ -371,6 +394,7 @@ public PayoutRequest build() { request.setDeviceDetails(deviceDetails); request.setUserDetails(userDetails); request.setCompanyDetails(companyDetails); + request.setCurrencyConversion(currencyConversion); return ValidationUtils.validate(super.build(request)); } } From 5f6122716cda2c4a55d1ec4c6bb7d4c4d60b8558 Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Tue, 24 Oct 2023 12:16:38 +0300 Subject: [PATCH 19/55] pbi/be-638608- release version --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff09f43..4c1c476 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.3 + 1.7.4 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.3 + 1.7.4 org.apache.bval diff --git a/pom.xml b/pom.xml index 0f594d3..33fa9fb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.4-SNAPSHOT + 1.7.4 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From 0c91ded9f2bbd123ee42e7a3b571d20d65703b9c Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Tue, 24 Oct 2023 12:34:29 +0300 Subject: [PATCH 20/55] pbi/be-638608-fix_pom_dependency --- pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33fa9fb..f648e62 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,28 @@ - + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + ${gpg.keyname} + + --pinentry-mode + loopback + + + + + org.apache.maven.plugins maven-compiler-plugin From 8ede90312bfdde151c57ec6f28d7e96827edc52c Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Tue, 24 Oct 2023 13:10:26 +0000 Subject: [PATCH 21/55] Merged PR 60834: add SNAPSHOT_version add SNAPSHOT_version Related work items: #638608 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f648e62..44c04c3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.4 + 1.7.5-SNAPSHOT Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From dfe34b751914a3f7a58d3039e7c7dede13936329 Mon Sep 17 00:00:00 2001 From: Dilyan Angelov Date: Tue, 21 Nov 2023 13:39:43 +0000 Subject: [PATCH 22/55] Added build-sdk.yaml --- build-sdk.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 build-sdk.yaml diff --git a/build-sdk.yaml b/build-sdk.yaml new file mode 100644 index 0000000..2ebf6fc --- /dev/null +++ b/build-sdk.yaml @@ -0,0 +1,9 @@ +trigger: none +resources: + repositories: + - repository: DevOpsTemplates + name: DigitalPayments/DevOps-Templates + type: git + ref: master + jobs: + - template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates \ No newline at end of file From f9453a830cdc221af25bc3fc16abf77823686023 Mon Sep 17 00:00:00 2001 From: Dilyan Angelov Date: Tue, 21 Nov 2023 14:16:04 +0000 Subject: [PATCH 23/55] Update build-sdk.yaml for Azure Pipelines --- build-sdk.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-sdk.yaml b/build-sdk.yaml index 2ebf6fc..c6bdfcd 100644 --- a/build-sdk.yaml +++ b/build-sdk.yaml @@ -5,5 +5,10 @@ resources: name: DigitalPayments/DevOps-Templates type: git ref: master + + +stages: +- stage: build + displayName: "Build RestAPI1.0-SDK" jobs: - - template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates \ No newline at end of file + - template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates From cb3308ab8221dc5c4388dde916d2c2ec7ce1a4fe Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Wed, 6 Dec 2023 11:48:35 +0000 Subject: [PATCH 24/55] Merged PR 65456: Release 1.7.5 Release candidate 1.7.5 Related work items: #491683, #531189, #534413, #534415, #534416, #539382, #545611, #562135, #569048, #639338 --- README.md | 4 +- pom-github.xml | 2 +- pom-internal.xml | 2 +- pom.xml | 2 +- .../com/safecharge/biz/RequestBuilder.java | 4 +- .../java/com/safecharge/biz/Safecharge.java | 8 +-- .../java/com/safecharge/model/CardData.java | 21 ++++++++ .../model/CommonUserDetailsInfo.java | 27 ++++++++-- .../com/safecharge/model/DeviceDetails.java | 9 ++++ .../com/safecharge/model/ExternalMpi.java | 13 ++++- .../request/AccountCaptureRequest.java | 41 +++++++++++++--- .../request/CreateSubscriptionRequest.java | 29 +++++++++++ .../request/basic/CashierUserRequest.java | 24 +++++++-- .../builder/SafechargeCashierUserBuilder.java | 17 +++++-- .../Authorize3dAndPaymentResponse.java | 15 +++++- .../response/InitPaymentResponse.java | 14 +++++- .../safecharge/response/Verify3dResponse.java | 10 ++++ .../com/safecharge/util/ChecksumUtils.java | 4 +- .../com/safecharge/test/ValidationsTest.java | 49 ++++++++++++++++++- 19 files changed, 256 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 4c1c476..dc0460c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.4 + 1.7.5 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.4 + 1.7.5 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index 7996baa..074e4b2 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.5 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom-internal.xml b/pom-internal.xml index 94e3761..8461205 100644 --- a/pom-internal.xml +++ b/pom-internal.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.1 + 1.7.5 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index 44c04c3..8461205 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.5-SNAPSHOT + 1.7.5 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index b13ac73..232ea5c 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -342,7 +342,7 @@ public McpRatesRequest getMcpRatesRequest(String sessionToken, MerchantInfo merc } public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId, - String userTokenId, String paymentMethod, String currencyCode, String countryCode, + String userTokenId, String paymentMethod, String currencyCode, String country, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) { return AccountCaptureRequest.builder() .addSessionToken(sessionToken) @@ -351,7 +351,7 @@ public AccountCaptureRequest getAccountCaptureRequest(String sessionToken, Merch .addUserTokenId(userTokenId) .addPaymentMethod(paymentMethod) .addCurrencyCode(currencyCode) - .addCountryCode(countryCode) + .addCountry(country) .addLanguageCode(languageCode) .addAmount(amount) .addNotificationUrl(notificationUrl) diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index ee0bd13..6abd395 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -614,7 +614,7 @@ public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestI * @param userTokenId The ID of the user in the merchant’s system. * @param paymentMethod Specifies the payment method name of the payment option to be charged. * @param currencyCode The three-letter ISO currency code. - * @param countryCode The two-letter ISO country code. + * @param country The two-letter ISO country code. * @param languageCode The language in which the transaction is to be completed. * @param amount The transaction amount. * @param notificationUrl The URL to which DMNs are sent (see our DMNs Guide). @@ -626,12 +626,12 @@ public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestI * @throws SafechargeException */ public AccountCaptureResponse accountCapture(String clientRequestId, String userTokenId, String paymentMethod, String currencyCode, - String countryCode, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) throws SafechargeException { + String country, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); AccountCaptureRequest request = requestBuilder.getAccountCaptureRequest(sessionToken, merchantInfo, clientRequestId, - userTokenId, paymentMethod, currencyCode, countryCode, languageCode, amount, notificationUrl, deviceDetails, userDetails, urlDetails); + userTokenId, paymentMethod, currencyCode, country, languageCode, amount, notificationUrl, deviceDetails, userDetails, urlDetails); return (AccountCaptureResponse) requestExecutor.execute(request); } @@ -723,7 +723,7 @@ public GetPayoutStatusResponse getPayoutStatus(String clientRequestId) throws Sa * @param countryCode The country the transaction is to be completed in. * @param languageCode The language the transaction is to be completed in. * @param type Will determain which type of payment methods will be returned. Possible values: DEPOSIT, WITHDRAWAL. - * @return + * @return Passes through the response from Safecharge's REST API. * @throws SafechargeException */ public GetMerchantPaymentMethodsResponse getMerchantPaymentMethods(String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) throws SafechargeException { diff --git a/src/main/java/com/safecharge/model/CardData.java b/src/main/java/com/safecharge/model/CardData.java index 222d8d1..e8afbb0 100644 --- a/src/main/java/com/safecharge/model/CardData.java +++ b/src/main/java/com/safecharge/model/CardData.java @@ -35,6 +35,11 @@ public class CardData { @Size(min = 3, max = 4, message = "cvv size must be 3 or 4 characters long!") private String CVV; + private String brand; + + @Size(max = 4, message = "last4Digits size must be up to 4 digits long!") + private String last4Digits; + public CardData() { } @@ -94,4 +99,20 @@ public String getCcTempToken() { public void setCcTempToken(String ccTempToken) { this.ccTempToken = ccTempToken; } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getLast4Digits() { + return last4Digits; + } + + public void setLast4Digits(String last4Digits) { + this.last4Digits = last4Digits; + } } diff --git a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java b/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java index 9b3e4e1..b477ba2 100644 --- a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java +++ b/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java @@ -14,7 +14,7 @@ public abstract class CommonUserDetailsInfo { private String phone; private String zip; private String city; - private String countryCode; + private String country; private String state; private String email; private String locale; @@ -68,12 +68,29 @@ public void setCity(String city) { this.city = city; } + /** + * This method is no longer acceptable to get the country code. + *

Use {@link #getCountry()} instead. + */ + @Deprecated public String getCountryCode() { - return countryCode; + return getCountry(); } + /** + * This method is no longer acceptable to set the country code. + *

Use {@link #setCountry(String)} instead. + */ public void setCountryCode(String countryCode) { - this.countryCode = countryCode; + setCountry(countryCode); + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; } public String getState() { @@ -129,8 +146,8 @@ public String toString() { sb.append(", city='") .append(city) .append('\''); - sb.append(", countryCode='") - .append(countryCode) + sb.append(", country='") + .append(country) .append('\''); sb.append(", state='") .append(state) diff --git a/src/main/java/com/safecharge/model/DeviceDetails.java b/src/main/java/com/safecharge/model/DeviceDetails.java index a0819c8..ad3d7ce 100644 --- a/src/main/java/com/safecharge/model/DeviceDetails.java +++ b/src/main/java/com/safecharge/model/DeviceDetails.java @@ -33,6 +33,8 @@ public class DeviceDetails { @Pattern(regexp = APIConstants.IP_ADDRESS_REGEX, message = "the entered value is not a valid ipAddress") private String ipAddress; + private String deviceManufacturerIdentifier; + public String getDeviceType() { return deviceType; } @@ -73,4 +75,11 @@ public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } + public String getDeviceManufacturerIdentifier() { + return deviceManufacturerIdentifier; + } + + public void setDeviceManufacturerIdentifier(String deviceManufacturerIdentifier) { + this.deviceManufacturerIdentifier = deviceManufacturerIdentifier; + } } diff --git a/src/main/java/com/safecharge/model/ExternalMpi.java b/src/main/java/com/safecharge/model/ExternalMpi.java index 828fbb6..162946d 100644 --- a/src/main/java/com/safecharge/model/ExternalMpi.java +++ b/src/main/java/com/safecharge/model/ExternalMpi.java @@ -27,6 +27,8 @@ public class ExternalMpi { @Size(max = 36, message = "value is invalid. The length of the value should be maximum {max} symbols.") private String dsTransID; + private String threeDProtocolVersion; + @Size(max = 25) private String challengePreference; @@ -100,6 +102,14 @@ public void setExternalTokenProvider(String externalTokenProvider) { this.externalTokenProvider = externalTokenProvider; } + public String getThreeDProtocolVersion() { + return threeDProtocolVersion; + } + + public void setThreeDProtocolVersion(String threeDProtocolVersion) { + this.threeDProtocolVersion = threeDProtocolVersion; + } + @Override public String toString() { @@ -111,7 +121,8 @@ public String toString() { .append(", exemptionRequestReason=").append(exemptionRequestReason) .append(", externalTokenProvider=").append(externalTokenProvider) .append(", challengePreference=").append(challengePreference) - .append(", dsTransId=").append(dsTransID); + .append(", dsTransId=").append(dsTransID) + .append(", threeDProtocolVersion=").append(threeDProtocolVersion); return builder.toString(); } diff --git a/src/main/java/com/safecharge/request/AccountCaptureRequest.java b/src/main/java/com/safecharge/request/AccountCaptureRequest.java index 0f58eff..5397c92 100644 --- a/src/main/java/com/safecharge/request/AccountCaptureRequest.java +++ b/src/main/java/com/safecharge/request/AccountCaptureRequest.java @@ -33,9 +33,8 @@ public class AccountCaptureRequest extends SafechargeRequest { @Size(max = 3) private String currencyCode; - @NotNull @Size(max = 2) - private String countryCode; + private String country; @NotNull @Size(max = 2) @@ -77,12 +76,30 @@ public void setCurrencyCode(String currencyCode) { this.currencyCode = currencyCode; } + /** + * This method is no longer acceptable to get the country code. + *

Use {@link #getCountry()} instead. + */ + @Deprecated public String getCountryCode() { - return countryCode; + return getCountry(); } + /** + * This method is no longer acceptable to set the country code. + *

Use {@link #setCountry(String)} instead. + */ + @Deprecated public void setCountryCode(String countryCode) { - this.countryCode = countryCode; + setCountry(countryCode); + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; } public String getLanguageCode() { @@ -142,7 +159,7 @@ public static class Builder extends SafechargeBuilder { private String userTokenId; private String paymentMethod; private String currencyCode; - private String countryCode; + private String country; private String languageCode; private String amount; private String notificationUrl; @@ -165,8 +182,18 @@ public Builder addCurrencyCode(String currencyCode) { return this; } + /** + * This method is no longer acceptable to set the country code. + *

Use {@link #addCountry(String)} instead. + */ + @Deprecated public Builder addCountryCode(String countryCode) { - this.countryCode = countryCode; + this.country = countryCode; + return this; + } + + public Builder addCountry(String country) { + this.country = country; return this; } @@ -206,7 +233,7 @@ public AccountCaptureRequest build() throws ConstraintViolationException { request.setUserTokenId(userTokenId); request.setPaymentMethod(paymentMethod); request.setCurrencyCode(currencyCode); - request.setCountryCode(countryCode); + request.setCountry(country); request.setLanguageCode(languageCode); request.setAmount(amount); request.setNotificationUrl(notificationUrl); diff --git a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java b/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java index 5712864..9a55a68 100644 --- a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java +++ b/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java @@ -7,6 +7,7 @@ import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import com.safecharge.model.CardData; @@ -85,6 +86,10 @@ public class CreateSubscriptionRequest @Valid private UserAddress billingAddress; + @Size(max = 20, message = "is not valid") + @Pattern(regexp = "\\d+", message = "is not valid") + private String initialTransactionId; + public static Builder builder() { return new Builder(); } @@ -169,12 +174,23 @@ public void setBillingAddress(UserAddress billingAddress) { this.billingAddress = billingAddress; } + public String getInitialTransactionId() { + return initialTransactionId; + } + + public void setInitialTransactionId(String initialTransactionId) { + this.initialTransactionId = initialTransactionId; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CreateSubscriptionRequest{"); sb.append("subscriptionPlanId='") .append(subscriptionPlanId) .append('\''); + sb.append(", initialTransactionId='") + .append(initialTransactionId) + .append('\''); sb.append(", userTokenId='") .append(userTokenId) .append('\''); @@ -201,6 +217,7 @@ public String toString() { public static class Builder extends SafechargeBuilder { private String subscriptionPlanId; + private String initialTransactionId; private String userTokenId; private DynamicDescriptor dynamicDescriptor; private RestApiUserDetails userDetails; @@ -224,6 +241,17 @@ public CreateSubscriptionRequest.Builder addSubscriptionPlanId(String subscripti return this; } + /** + * Adds initial transaction ID to the request. + * + * @param initialTransactionId The initial transaction ID as {@link String} + * @return this object + */ + public CreateSubscriptionRequest.Builder addInitialTransactionId(String initialTransactionId) { + this.initialTransactionId = initialTransactionId; + return this; + } + /** * Adds user token id to the request. * @@ -541,6 +569,7 @@ public Builder addBillingAddress(UserAddress billingAddress) { public SafechargeBaseRequest build() throws ConstraintViolationException { CreateSubscriptionRequest createSubscriptionRequest = new CreateSubscriptionRequest(); createSubscriptionRequest.setSubscriptionPlanId(subscriptionPlanId); + createSubscriptionRequest.setInitialTransactionId(initialTransactionId); createSubscriptionRequest.setUserTokenId(userTokenId); createSubscriptionRequest.setDynamicDescriptor(dynamicDescriptor); createSubscriptionRequest.setUserDetails(userDetails); diff --git a/src/main/java/com/safecharge/request/basic/CashierUserRequest.java b/src/main/java/com/safecharge/request/basic/CashierUserRequest.java index 5dcd68c..e36d93b 100644 --- a/src/main/java/com/safecharge/request/basic/CashierUserRequest.java +++ b/src/main/java/com/safecharge/request/basic/CashierUserRequest.java @@ -22,7 +22,7 @@ public class CashierUserRequest extends SafechargeRequest { private String phone; private String city; private String zip; - private String countryCode; + private String country; private String state; private String locale; private String dateOfBirth; @@ -84,12 +84,30 @@ public void setZip(String zip) { this.zip = zip; } + /** + * This method is no longer acceptable to get the country code. + *

Use {@link #getCountry()} instead. + */ + @Deprecated public String getCountryCode() { - return countryCode; + return getCountry(); } + /** + * This method is no longer acceptable to set the country code. + *

Use {@link #setCountry(String)} instead. + */ + @Deprecated public void setCountryCode(String country) { - this.countryCode = country; + setCountry(country); + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; } public String getState() { diff --git a/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java index dc2f576..5eb22b5 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java @@ -11,7 +11,6 @@ public abstract class SafechargeCashierUserBuilder> extends SafechargeBuilder { private String userTokenId; - private String firstName; private String lastName; private String address; @@ -19,7 +18,7 @@ public abstract class SafechargeCashierUserBuilder Use {@link #country(String)} instead. + */ + @Deprecated public T countryCode(String countryCode) { - this.countryCode = countryCode; + this.country = countryCode; + return (T) this; + } + + public T country(String country) { + this.country = country; return (T) this; } @@ -102,7 +111,7 @@ public S build(S request) { request.setPhone(phone); request.setCity(city); request.setZip(zip); - request.setCountryCode(countryCode); + request.setCountry(country); request.setState(state); request.setLocale(locale); request.setDateOfBirth(dateOfBirth); diff --git a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java index 8492275..a53670e 100644 --- a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java @@ -59,6 +59,8 @@ public abstract class Authorize3dAndPaymentResponse extends SafechargeResponse { private String isAFT; + private String mcc; + public String getOrderId() { return orderId; } @@ -251,6 +253,14 @@ public void setIsAFT(String isAFT) { this.isAFT = isAFT; } + public String getMcc() { + return mcc; + } + + public void setMcc(String mcc) { + this.mcc = mcc; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -279,8 +289,9 @@ public String toString() { .append(", openInExternalBrowser=").append(openInExternalBrowser) .append(", merchantAdviceCode=").append(merchantAdviceCode) .append(", openInExternalBrowser=").append(openInExternalBrowser) - .append(", isAFT=").append(isAFT); - + .append(", isAFT=").append(isAFT) + .append(", partialApproval=").append(partialApproval) + .append(", mcc=").append(mcc); return sb.toString(); } } diff --git a/src/main/java/com/safecharge/response/InitPaymentResponse.java b/src/main/java/com/safecharge/response/InitPaymentResponse.java index b9e2511..051bb63 100644 --- a/src/main/java/com/safecharge/response/InitPaymentResponse.java +++ b/src/main/java/com/safecharge/response/InitPaymentResponse.java @@ -34,6 +34,8 @@ public class InitPaymentResponse extends SafechargeResponse { private String resultDescription; + private String mcc; + public String getOrderId() { return orderId; } @@ -138,6 +140,14 @@ public void setResultDescription(String resultDescription) { this.resultDescription = resultDescription; } + public String getMcc() { + return mcc; + } + + public void setMcc(String mcc) { + this.mcc = mcc; + } + @Override public String toString() { StringBuilder sb = new StringBuilder("InitPaymentResponse{"); @@ -153,8 +163,8 @@ public String toString() { .append(", gwErrorCode=").append(gwErrorCode).append('\'') .append(", resultStatus=").append(resultStatus).append('\'') .append(", resultCode=").append(resultCode).append('\'') - .append(", resultDescription=").append(resultDescription); - + .append(", resultDescription=").append(resultDescription) + .append(", mcc=").append(mcc); return sb.toString(); } } diff --git a/src/main/java/com/safecharge/response/Verify3dResponse.java b/src/main/java/com/safecharge/response/Verify3dResponse.java index 5e5f30d..9a29bdb 100644 --- a/src/main/java/com/safecharge/response/Verify3dResponse.java +++ b/src/main/java/com/safecharge/response/Verify3dResponse.java @@ -31,6 +31,8 @@ public class Verify3dResponse extends SafechargeResponse { private Integer gwExtendedErrorCode; + private String mcc; + public String getOrderId() { return orderId; } @@ -118,4 +120,12 @@ public Integer getGwExtendedErrorCode() { public void setGwExtendedErrorCode(Integer gwExtendedErrorCode) { this.gwExtendedErrorCode = gwExtendedErrorCode; } + + public String getMcc() { + return mcc; + } + + public void setMcc(String mcc) { + this.mcc = mcc; + } } diff --git a/src/main/java/com/safecharge/util/ChecksumUtils.java b/src/main/java/com/safecharge/util/ChecksumUtils.java index c9aa704..c8eb852 100644 --- a/src/main/java/com/safecharge/util/ChecksumUtils.java +++ b/src/main/java/com/safecharge/util/ChecksumUtils.java @@ -81,11 +81,11 @@ private ChecksumUtils() { requestChecksumOrder.put(Constants.ChecksumOrderMapping.MODIFY_CASHIER_USER.name(), Arrays.asList("merchantId", "merchantSiteId", "userTokenId", "clientRequestId", "firstName", "lastName", "address", "state", - "city", "zip", "countryCode", "phone", "locale", "email", "county", "timeStamp")); + "city", "zip", "country", "phone", "locale", "email", "county", "timeStamp")); requestChecksumOrder.put(Constants.ChecksumOrderMapping.ADD_CASHIER_USER.name(), Arrays.asList("merchantId", "merchantSiteId", "userTokenId", "clientRequestId", "firstName", "lastName", - "address", "state", "city", "zip", "countryCode", "phone", "locale", "email", "county", "timeStamp")); + "address", "state", "city", "zip", "country", "phone", "locale", "email", "county", "timeStamp")); requestChecksumOrder.put(Constants.ChecksumOrderMapping.ADD_CASHIER_CC_CARD_DATA.name(), Arrays.asList( "merchantId", "merchantSiteId", "userTokenId", "clientRequestId", "ccExpMonth", "ccExpYear", "ccNameOnCard", diff --git a/src/test/java/com/safecharge/test/ValidationsTest.java b/src/test/java/com/safecharge/test/ValidationsTest.java index 06b67b9..d2e1035 100644 --- a/src/test/java/com/safecharge/test/ValidationsTest.java +++ b/src/test/java/com/safecharge/test/ValidationsTest.java @@ -133,6 +133,7 @@ public class ValidationsTest { private static final CardData dummyCardData = new CardData(); private static final String dummySubscriptionPlanId = "123456"; + private static final String dummyInitialTransactionId = "123456"; private static final String dummyRelatedTransactionId = "1234567"; private static final String dummyAuthCode = "auth_code"; @@ -421,6 +422,7 @@ public void testSuccessfulValidation_CreateSubscriptionRequest() { .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addSubscriptionPlanId(dummySubscriptionPlanId) + .addInitialTransactionId(dummyInitialTransactionId) .addCardData(cardData) .addDynamicDescriptor(dynamicDescriptor) .addDeviceDetails("type", "name", "windows", "firefox", "127.0.0.1") @@ -447,6 +449,35 @@ public void testFailedValidation_CreateSubscriptionRequest() { } } + @Test + public void testFailedValidationForInitialTransactionId_CreateSubscriptionRequest() { + + try { + CreateSubscriptionRequest.builder() + .addMerchantInfo(validMerchantInfo) + .addUserTokenId(dummyUserId) + .addSubscriptionPlanId(dummySubscriptionPlanId) + .addInitialTransactionId("abcd") + .addCardData(cardData) + .addDynamicDescriptor(dynamicDescriptor) + .addDeviceDetails("type", "name", "windows", "firefox", "127.0.0.1") + .addMerchantDetails("customField1", "customField2", "customField3", "customField4", "customField5", + "customField6", "customField7", + "customField8", "customField9", "customField10", "customField11", "customField12", + "customField13", "customField14", + "customField15") + .addURLDetails("failureUrl", "pendingUrl", "successUrl", "notificationUrl") + .addUserPaymentOption("cvv", "111111") + .build(); + fail(CONSTRAINT_VIOLATION_EXCEPTION_EXPECTED_BUT_OBJECT_CREATION_PASSED_SUCCESSFULLY); + } catch (ConstraintViolationException e) { + assertEquals(1, e.getConstraintViolations().size()); + ConstraintViolation violation = e.getConstraintViolations().iterator().next(); + assertEquals("initialTransactionId", violation.getPropertyPath().toString()); + assertEquals("is not valid", violation.getMessage()); + } + } + @Test public void testSuccessfulValidation_GetMerchantPaymentMethodsRequest() { @@ -1178,7 +1209,7 @@ public void testFailedValidation_GetMcpRates() { } @Test - public void testSuccessfulValidation_AccountCapture() { + public void testSuccessfulValidationWithDeprecatedCountryCode_AccountCapture() { AccountCaptureRequest accountCaptureRequest = AccountCaptureRequest.builder() .addMerchantInfo(validMerchantInfo) .addPaymentMethod("payment_method") @@ -1191,13 +1222,27 @@ public void testSuccessfulValidation_AccountCapture() { assertNotNull(accountCaptureRequest); } + @Test + public void testSuccessfulValidation_AccountCapture() { + AccountCaptureRequest accountCaptureRequest = AccountCaptureRequest.builder() + .addMerchantInfo(validMerchantInfo) + .addPaymentMethod("payment_method") + .addCountry("BG") + .addUserTokenId("userTokenId") + .addCurrencyCode("BGN") + .addLanguageCode("en") + .build(); + + assertNotNull(accountCaptureRequest); + } + @Test public void testFailedValidation_AccountCapture() { try { AccountCaptureRequest.builder() .addMerchantInfo(validMerchantInfo) .addPaymentMethod("payment_method") - .addCountryCode("BG") + .addCountry("BG") .addUserTokenId("userTokenId") .addCurrencyCode("BGN") .build(); From 362ff28f8fef8ef172b9ddef5acea1b1dc7fd24b Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Wed, 13 Dec 2023 15:39:16 +0200 Subject: [PATCH 25/55] pbi/be-658717 - add identification and identificationType --- pom.xml | 2 +- .../model/CommonUserDetailsInfo.java | 26 +++++++++++++++ .../safecharge/model/RestApiUserDetails.java | 32 +++++++++++++++++++ .../com/safecharge/util/APIConstants.java | 3 ++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8461205..a433dde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.5 + 1.7.6-SNAPSHOT Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java b/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java index b477ba2..c85c383 100644 --- a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java +++ b/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java @@ -19,6 +19,8 @@ public abstract class CommonUserDetailsInfo { private String email; private String locale; private String county; + private String identification; + private String identificationType; public String getFirstName() { return firstName; @@ -125,6 +127,24 @@ public void setCounty(String county) { this.county = county; } + public String getIdentification() { + return identification; + } + + public CommonUserDetailsInfo setIdentification(String identification) { + this.identification = identification; + return this; + } + + public String getIdentificationType() { + return identificationType; + } + + public CommonUserDetailsInfo setIdentificationType(String identificationType) { + this.identificationType = identificationType; + return this; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder(); @@ -161,6 +181,12 @@ public String toString() { sb.append(", county='") .append(county) .append('\''); + sb.append(", identification='") + .append(identification) + .append('\''); + sb.append(", identificationType='") + .append(identificationType) + .append('\''); sb.append('}'); return sb.toString(); diff --git a/src/main/java/com/safecharge/model/RestApiUserDetails.java b/src/main/java/com/safecharge/model/RestApiUserDetails.java index 819ca4d..2161979 100644 --- a/src/main/java/com/safecharge/model/RestApiUserDetails.java +++ b/src/main/java/com/safecharge/model/RestApiUserDetails.java @@ -60,6 +60,14 @@ public class RestApiUserDetails { message = "county size must be up to 255 characters long!") private String county; + @Size(max = APIConstants.SSN_IDENTIFICATION_MAX_LENGTH, + message = "identification size must be up to 15 characters long!") + private String identification; + + @Size(max = APIConstants.APM_IDENTIFICATION_TYPE_MAX_LENGTH, + message = "identification type size must be up to 100 characters long!") + private String identificationType; + public String getFirstName() { return firstName; } @@ -148,6 +156,24 @@ public void setCounty(String county) { this.county = county; } + public String getIdentification() { + return identification; + } + + public RestApiUserDetails setIdentification(String identification) { + this.identification = identification; + return this; + } + + public String getIdentificationType() { + return identificationType; + } + + public RestApiUserDetails setIdentificationType(String identificationType) { + this.identificationType = identificationType; + return this; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("RestApiUserDetails{"); @@ -184,6 +210,12 @@ public String toString() { sb.append(", county='") .append(county) .append('\''); + sb.append(", identification='") + .append(identification) + .append('\''); + sb.append(", identificationType='") + .append(identificationType) + .append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/safecharge/util/APIConstants.java b/src/main/java/com/safecharge/util/APIConstants.java index 15e8d06..8eec0f1 100644 --- a/src/main/java/com/safecharge/util/APIConstants.java +++ b/src/main/java/com/safecharge/util/APIConstants.java @@ -104,6 +104,9 @@ public String getUrl() { short COUNTY_MAX_LENGTH = 255; short EMAIL_MAX_LENGTH = 100; + short APM_IDENTIFICATION_TYPE_MAX_LENGTH =100; + short SSN_IDENTIFICATION_MAX_LENGTH = 15; + // field limitations using regular expressions: String IP_ADDRESS_REGEX = "^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"; From 9916f56f5a60dea8abd84347a2d8f5408bfa496a Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Wed, 17 Jan 2024 15:24:03 +0200 Subject: [PATCH 26/55] change_release_version --- README.md | 4 ++-- pom-github.xml | 2 +- pom-internal.xml | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc0460c..42bae1a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.5 + 1.7.6 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.5 + 1.7.6 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index 074e4b2..abf59fa 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.5 + 1.7.6 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom-internal.xml b/pom-internal.xml index 8461205..620e804 100644 --- a/pom-internal.xml +++ b/pom-internal.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.5 + 1.7.6 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index a433dde..620e804 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.6-SNAPSHOT + 1.7.6 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From bdcabac88e961aa0d2e2fb20123f23ae3045bd20 Mon Sep 17 00:00:00 2001 From: Mikaela Zhekova Date: Mon, 5 Feb 2024 10:05:40 +0200 Subject: [PATCH 27/55] 668161 - the new cardAuthMethod param is added to initPayment flow --- .../safecharge/response/InitPaymentResponse.java | 16 ++++++++++++++-- src/main/java/com/safecharge/util/Constants.java | 7 +++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/safecharge/response/InitPaymentResponse.java b/src/main/java/com/safecharge/response/InitPaymentResponse.java index 051bb63..2ccc336 100644 --- a/src/main/java/com/safecharge/response/InitPaymentResponse.java +++ b/src/main/java/com/safecharge/response/InitPaymentResponse.java @@ -5,6 +5,7 @@ package com.safecharge.response; import com.safecharge.model.PaymentOptionResponse; +import com.safecharge.util.Constants.CardAuthMethod; public class InitPaymentResponse extends SafechargeResponse { @@ -36,6 +37,8 @@ public class InitPaymentResponse extends SafechargeResponse { private String mcc; + private CardAuthMethod cardAuthMethod; + public String getOrderId() { return orderId; } @@ -148,6 +151,14 @@ public void setMcc(String mcc) { this.mcc = mcc; } + public CardAuthMethod getCardAuthMethod() { + return cardAuthMethod; + } + + public void setCardAuthMethod(CardAuthMethod cardAuthMethod) { + this.cardAuthMethod = cardAuthMethod; + } + @Override public String toString() { StringBuilder sb = new StringBuilder("InitPaymentResponse{"); @@ -163,8 +174,9 @@ public String toString() { .append(", gwErrorCode=").append(gwErrorCode).append('\'') .append(", resultStatus=").append(resultStatus).append('\'') .append(", resultCode=").append(resultCode).append('\'') - .append(", resultDescription=").append(resultDescription) - .append(", mcc=").append(mcc); + .append(", resultDescription=").append(resultDescription).append('\'') + .append(", mcc=").append(mcc).append('\'') + .append(", cardAuthMethod=").append(cardAuthMethod); return sb.toString(); } } diff --git a/src/main/java/com/safecharge/util/Constants.java b/src/main/java/com/safecharge/util/Constants.java index 6d85b48..dba5a55 100644 --- a/src/main/java/com/safecharge/util/Constants.java +++ b/src/main/java/com/safecharge/util/Constants.java @@ -282,4 +282,11 @@ public String isVerified() { enum EditUpoBuilderType { APM, CCARD, DELETE, SUSPEND, ENABLE } + + /** + * Used for mapping the authMethod: PAN_ONLY to PAN_ONLY; CRYPTOGRAM_3DS to DPAN + */ + public enum CardAuthMethod { + DPAN, PAN_ONLY + } } From 89b6890067f9552c4b94180e8e03957e700efa35 Mon Sep 17 00:00:00 2001 From: Radostin Tonev Date: Wed, 14 Feb 2024 11:56:05 +0000 Subject: [PATCH 28/55] Merged PR 71994: #673769 Update to version 1.7.7 Update to version 1.7.7 Related work items: #673769 --- README.md | 4 ++-- pom-github.xml | 2 +- pom-internal.xml | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 42bae1a..214872c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.6 + 1.7.7 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.6 + 1.7.7 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index abf59fa..dcff11e 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.6 + 1.7.7 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom-internal.xml b/pom-internal.xml index 620e804..acfc4a8 100644 --- a/pom-internal.xml +++ b/pom-internal.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.6 + 1.7.7 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index 620e804..acfc4a8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.6 + 1.7.7 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, From 1d9ba22dc9ae6e52fa1a070e5f87d5b5c8e1d4c1 Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Wed, 13 Mar 2024 11:31:18 +0200 Subject: [PATCH 29/55] pbi/be-703957- Riverty - new integration support payment --- pom.xml | 2 +- .../com/safecharge/biz/RequestBuilder.java | 6 +- .../java/com/safecharge/biz/Safecharge.java | 9 +- .../java/com/safecharge/model/Addendums.java | 10 +++ src/main/java/com/safecharge/model/Item.java | 86 +++++++++++++++++++ .../java/com/safecharge/model/RiskInfo.java | 34 ++++++++ .../model/ShippingTrackingDetails.java | 65 ++++++++++++++ .../com/safecharge/model/UserAddress.java | 20 +++++ .../builder/SafechargeOrderBuilder.java | 16 +++- .../com/safecharge/biz/SafechargeTest.java | 10 ++- 10 files changed, 246 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/safecharge/model/RiskInfo.java create mode 100644 src/main/java/com/safecharge/model/ShippingTrackingDetails.java diff --git a/pom.xml b/pom.xml index acfc4a8..d429448 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.7 + 1.7.8-SNAPSHOT Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 232ea5c..214d25c 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -29,7 +29,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, - RecipientDetails recipientDetails, CompanyDetails companyDetails) { + RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -69,6 +69,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .addAftOverride(aftOverride) .addRecipientDetails(recipientDetails) .addCompanyDetails(companyDetails) + .addShippingTrackingDetails(shippingTrackingDetails) .build(); } @@ -103,7 +104,7 @@ public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, Stri String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails) { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { return OpenOrderRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -143,6 +144,7 @@ public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, Stri .addOpenAmount(openAmount) .addAftOverride(aftOverride) .addCompanyDetails(companyDetails) + .addShippingTrackingDetails(shippingTrackingDetails) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 6abd395..f69da3f 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -118,6 +118,7 @@ private String getSessionToken() throws SafechargeException { * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". * @param recipientDetails This class is relevant for Visa’s AFTs, and contains the details of the recipient receiving the funding. * @param companyDetails Holds information about company taxId. + * @param shippingTrackingDetails Holds information about shippingTrackingDetails. * @return Passes through the response from Safecharge's REST API. * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. @@ -130,7 +131,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, - String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails) throws SafechargeException { + String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -138,7 +139,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails); return (PaymentResponse) requestExecutor.execute(request); } @@ -249,7 +250,7 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails) throws SafechargeException { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -257,7 +258,7 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S paymentOption, transactionType, currency, amount, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, urlDetails, userTokenId, clientUniqueId, userPaymentOption, paymentMethod, amountDetails, addendums, customData, autoPayment3D, isMoto, authenticationOnlyType, subMerchant, isRebilling, rebillingType, - preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride, companyDetails); + preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride, companyDetails, shippingTrackingDetails); return (OpenOrderResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/model/Addendums.java b/src/main/java/com/safecharge/model/Addendums.java index 04b2426..d37f8e7 100644 --- a/src/main/java/com/safecharge/model/Addendums.java +++ b/src/main/java/com/safecharge/model/Addendums.java @@ -25,6 +25,8 @@ public class Addendums { @Valid private AddendumsAirlines airlines; + private RiskInfo risk; + public AddendumsLocalPayment getLocalPayment() { return localPayment; } @@ -48,4 +50,12 @@ public AddendumsAirlines getAirlines() { public void setAirlines(AddendumsAirlines airlines) { this.airlines = airlines; } + + public RiskInfo getRisk() { + return risk; + } + + public void setRisk(RiskInfo risk) { + this.risk = risk; + } } diff --git a/src/main/java/com/safecharge/model/Item.java b/src/main/java/com/safecharge/model/Item.java index 6c60e65..e11578e 100644 --- a/src/main/java/com/safecharge/model/Item.java +++ b/src/main/java/com/safecharge/model/Item.java @@ -28,6 +28,28 @@ public class Item { @Size(min = 1, max = 10, message = "quantity size must be up to 10 characters long!") private String quantity; + + @Size(max=50, message = "type size must be up to 50 characters long!") + private String type; + + @Size(max=10, message = "discount size must be up to 10 characters long!") + private String discount; + + @Size(max=10, message = "shipping size must be up to 10 characters long!") + private String shipping; + + @Size(max=10, message = "shippingTax size must be up to 10 characters long!") + private String shippingTax; + + @Size(max=10, message = "tax size must be up to 10 characters long!") + private String tax; + + private String groupId; + + private String imageUrl; + + private String productUrl; + public String getName() { return name; } @@ -51,4 +73,68 @@ public String getQuantity() { public void setQuantity(String quantity) { this.quantity = quantity; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDiscount() { + return discount; + } + + public void setDiscount(String discount) { + this.discount = discount; + } + + public String getShipping() { + return shipping; + } + + public void setShipping(String shipping) { + this.shipping = shipping; + } + + public String getShippingTax() { + return shippingTax; + } + + public void setShippingTax(String shippingTax) { + this.shippingTax = shippingTax; + } + + public String getTax() { + return tax; + } + + public void setTax(String tax) { + this.tax = tax; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getProductUrl() { + return productUrl; + } + + public void setProductUrl(String productUrl) { + this.productUrl = productUrl; + } } diff --git a/src/main/java/com/safecharge/model/RiskInfo.java b/src/main/java/com/safecharge/model/RiskInfo.java new file mode 100644 index 0000000..8b5953f --- /dev/null +++ b/src/main/java/com/safecharge/model/RiskInfo.java @@ -0,0 +1,34 @@ +package com.safecharge.model; + +public class RiskInfo { + + private boolean existingCustomer; + + private int currentNumberOfTransactions; + + private String customerSince; + + public boolean isExistingCustomer() { + return existingCustomer; + } + + public void setExistingCustomer(boolean existingCustomer) { + this.existingCustomer = existingCustomer; + } + + public int getCurrentNumberOfTransactions() { + return currentNumberOfTransactions; + } + + public void setCurrentNumberOfTransactions(int currentNumberOfTransactions) { + this.currentNumberOfTransactions = currentNumberOfTransactions; + } + + public String getCustomerSince() { + return customerSince; + } + + public void setCustomerSince(String customerSince) { + this.customerSince = customerSince; + } +} diff --git a/src/main/java/com/safecharge/model/ShippingTrackingDetails.java b/src/main/java/com/safecharge/model/ShippingTrackingDetails.java new file mode 100644 index 0000000..43498df --- /dev/null +++ b/src/main/java/com/safecharge/model/ShippingTrackingDetails.java @@ -0,0 +1,65 @@ +package com.safecharge.model; + +public class ShippingTrackingDetails { + + + private String customerNumber; + + private String addressType; + + private String shippingType; + + private String shippingCarrierName; + + private String trackingId; + + private String trackingUrl; + + public String getCustomerNumber() { + return customerNumber; + } + + public void setCustomerNumber(String customerNumber) { + this.customerNumber = customerNumber; + } + + public String getAddressType() { + return addressType; + } + + public void setAddressType(String addressType) { + this.addressType = addressType; + } + + public String getShippingType() { + return shippingType; + } + + public void setShippingType(String shippingType) { + this.shippingType = shippingType; + } + + public String getShippingCarrierName() { + return shippingCarrierName; + } + + public void setShippingCarrierName(String shippingCarrierName) { + this.shippingCarrierName = shippingCarrierName; + } + + public String getTrackingId() { + return trackingId; + } + + public void setTrackingId(String trackingId) { + this.trackingId = trackingId; + } + + public String getTrackingUrl() { + return trackingUrl; + } + + public void setTrackingUrl(String trackingUrl) { + this.trackingUrl = trackingUrl; + } +} diff --git a/src/main/java/com/safecharge/model/UserAddress.java b/src/main/java/com/safecharge/model/UserAddress.java index 87f506a..f0d1421 100644 --- a/src/main/java/com/safecharge/model/UserAddress.java +++ b/src/main/java/com/safecharge/model/UserAddress.java @@ -95,6 +95,10 @@ public class UserAddress { @Size(max = APIConstants.ADDRESS_LINE_MAX_LENGTH, message = "addressLine3 size must be up to 60 characters long!") private String addressLine3; + private String careOf; + + private String salutation; + public String getAddress() { return address; } @@ -214,4 +218,20 @@ public String getAddressLine3() { public void setAddressLine3(String addressLine3) { this.addressLine3 = addressLine3; } + + public String getCareOf() { + return careOf; + } + + public void setCareOf(String careOf) { + this.careOf = careOf; + } + + public String getSalutation() { + return salutation; + } + + public void setSalutation(String salutation) { + this.salutation = salutation; + } } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java index 858a558..4aafd8d 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java @@ -14,6 +14,7 @@ import com.safecharge.model.DynamicDescriptor; import com.safecharge.model.Item; import com.safecharge.model.MerchantDetails; +import com.safecharge.model.ShippingTrackingDetails; import com.safecharge.model.UrlDetails; import com.safecharge.model.UserAddress; import com.safecharge.request.SafechargeOrderDetailsRequest; @@ -50,6 +51,7 @@ public abstract class SafechargeOrderBuilder private String userTokenId; private String clientUniqueId; private AmountDetails amountDetails; + private ShippingTrackingDetails shippingTrackingDetails; /** * Adds amount to the request. @@ -469,7 +471,19 @@ public T addAmountDetails(String totalHandling, String totalShipping, String tot amountDetails.setTotalTax(totalTax); return addAmountDetails(amountDetails); } - + + /** + * Adds shippingTrackingDetails info to the request. + * + * @param shippingTrackingDetails {@link ShippingTrackingDetails} object to add to the request as shipping details + * @return this object + */ + public T addShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDetails) { + + this.shippingTrackingDetails = shippingTrackingDetails; + return (T) this; + } + /** * Adds the order details data, collected by this builder. * diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index 918721a..ec0a3d4 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -113,7 +113,7 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeExce PaymentResponse response = sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(PaymentRequest.class)); @@ -131,7 +131,7 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null); } @Test @@ -178,7 +178,8 @@ public void shouldExecuteOpenOrderRequestAndReturnResponse() throws SafechargeEx sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); OpenOrderResponse response = sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, + null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(OpenOrderRequest.class)); @@ -195,7 +196,8 @@ public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeR sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, + null, null, null, null, null, null, null); } @Test From 95a6231b7c2938ae263fbc5f7766f7486ee6097b Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Wed, 13 Mar 2024 16:05:28 +0200 Subject: [PATCH 30/55] pbi/be-703957- Riverty - settle support shippingTrackingDetails --- .../java/com/safecharge/biz/RequestBuilder.java | 3 ++- src/main/java/com/safecharge/biz/Safecharge.java | 4 ++-- .../builder/SafechargeTransactionBuilder.java | 13 +++++++++++++ .../java/com/safecharge/biz/SafechargeTest.java | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 214d25c..1b9d963 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -190,7 +190,7 @@ public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, Me String descriptorMerchantPhone, UrlDetails urlDetails, String amount, String authCode, String customData, String comment, String currency, String customSiteName, String productId, - String relatedTransactionId, SubMerchant subMerchant) { + String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) { return SettleTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addClientUniqueId(clientUniqueId) @@ -209,6 +209,7 @@ public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, Me .addProductId(productId) .addRelatedTransactionId(relatedTransactionId) .addSubMerchant(subMerchant) + .addShippingTrackingDetails(shippingTrackingDetails) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index f69da3f..7c719eb 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -359,13 +359,13 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String String descriptorMerchantName, String descriptorMerchantPhone, UrlDetails urlDetails, String amount, String authCode, String customData, String comment, String currency, String customSiteName, String productId, - String relatedTransactionId, SubMerchant subMerchant) throws SafechargeException { + String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); SafechargeBaseRequest request = requestBuilder.getSettleTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, addendums, descriptorMerchantName, descriptorMerchantPhone, urlDetails, amount, authCode, customData, comment, currency, - customSiteName, productId, relatedTransactionId, subMerchant); + customSiteName, productId, relatedTransactionId, subMerchant, shippingTrackingDetails); return (SettleTransactionResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java index 840e2f2..1b90a19 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java @@ -5,6 +5,7 @@ package com.safecharge.request.builder; import com.safecharge.model.CompanyDetails; +import com.safecharge.model.ShippingTrackingDetails; import com.safecharge.model.SubMerchant; import com.safecharge.model.UrlDetails; import com.safecharge.request.SafechargeTransactionRequest; @@ -37,6 +38,8 @@ public abstract class SafechargeTransactionBuilder Date: Thu, 21 Mar 2024 13:46:26 +0000 Subject: [PATCH 31/55] Merged PR 75829: Riverty - new integration support- payment\settle fix providing shippingTrackingDetails in builder before sending requests Related work items: #703957, #703963 --- .../request/SafechargeOrderDetailsRequest.java | 15 ++++++++++++++- .../request/SafechargeTransactionRequest.java | 12 ++++++++++++ .../request/SettleTransactionRequest.java | 16 ++++++++++++++++ .../request/builder/SafechargeOrderBuilder.java | 1 + .../builder/SafechargeTransactionBuilder.java | 12 ------------ 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java b/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java index d31b6a3..60f3951 100644 --- a/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java +++ b/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java @@ -18,6 +18,7 @@ import com.safecharge.model.DynamicDescriptor; import com.safecharge.model.Item; import com.safecharge.model.MerchantDetails; +import com.safecharge.model.ShippingTrackingDetails; import com.safecharge.model.UrlDetails; import com.safecharge.model.UserAddress; @@ -107,7 +108,9 @@ public abstract class SafechargeOrderDetailsRequest extends SafechargeRequest { private String clientUniqueId; private AmountDetails amountDetails; - + + private ShippingTrackingDetails shippingTrackingDetails; + @NotNull(message = "sessionToken parameter is mandatory!") public String getSessionToken() { return super.getSessionToken(); @@ -232,6 +235,14 @@ public void setAmountDetails(AmountDetails amountDetails) { this.amountDetails = amountDetails; } + public ShippingTrackingDetails getShippingTrackingDetails() { + return shippingTrackingDetails; + } + + public void setShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDetails) { + this.shippingTrackingDetails = shippingTrackingDetails; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder(); @@ -266,6 +277,8 @@ public String toString() { .append(clientUniqueId); sb.append(", amountDetails='") .append(amountDetails); + sb.append(", shippingTrackingDetails='") + .append(shippingTrackingDetails); sb.append(", "); sb.append(super.toString()); return sb.toString(); diff --git a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java index 66e53a2..c16c797 100644 --- a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java +++ b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java @@ -9,6 +9,7 @@ import javax.validation.constraints.Size; import com.safecharge.model.CompanyDetails; +import com.safecharge.model.ShippingTrackingDetails; import com.safecharge.model.SubMerchant; import com.safecharge.model.UrlDetails; @@ -78,6 +79,8 @@ public abstract class SafechargeTransactionRequest extends SafechargeRequest { @Valid private CompanyDetails companyDetails; + private ShippingTrackingDetails shippingTrackingDetails; + public String getAmount() { return amount; } @@ -174,6 +177,14 @@ public void setCompanyDetails(CompanyDetails companyDetails) { this.companyDetails = companyDetails; } + public ShippingTrackingDetails getShippingTrackingDetails() { + return shippingTrackingDetails; + } + + public void setShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDetails) { + this.shippingTrackingDetails = shippingTrackingDetails; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("SafechargeTransactionRequest{"); @@ -189,6 +200,7 @@ public String toString() { sb.append(", customData='").append(customData).append('\''); sb.append(", subMerchant='").append(subMerchant).append('\''); sb.append(", companyDetails='").append(companyDetails).append('\''); + sb.append(", shippingTrackingDetails='").append(shippingTrackingDetails).append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/safecharge/request/SettleTransactionRequest.java b/src/main/java/com/safecharge/request/SettleTransactionRequest.java index d44d0a0..be6133c 100644 --- a/src/main/java/com/safecharge/request/SettleTransactionRequest.java +++ b/src/main/java/com/safecharge/request/SettleTransactionRequest.java @@ -10,6 +10,7 @@ import com.safecharge.model.Addendums; import com.safecharge.model.DynamicDescriptor; +import com.safecharge.model.ShippingTrackingDetails; import com.safecharge.request.builder.SafechargeTransactionBuilder; import com.safecharge.util.Constants; import com.safecharge.util.ValidChecksum; @@ -90,6 +91,8 @@ public static class Builder extends SafechargeTransactionBuilder { private Addendums addendums; + private ShippingTrackingDetails shippingTrackingDetails; + /** * Sets the Descriptor merchant name in the request. * @@ -133,6 +136,17 @@ public Builder addAddendums(Addendums addendums) { return this; } + /** + * Adds shippingTrackingDetails info to the request. + * + * @param shippingTrackingDetails {@link ShippingTrackingDetails} object to add to the request as shipping details + * @return this object + */ + public Builder addShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDetails) { + this.shippingTrackingDetails = shippingTrackingDetails; + return this; + } + /** * Builds the request. * @@ -145,6 +159,8 @@ public SafechargeBaseRequest build() throws ConstraintViolationException { settleTransactionRequest.setDescriptorMerchantName(descriptorMerchantName); settleTransactionRequest.setDescriptorMerchantPhone(descriptorMerchantPhone); settleTransactionRequest.setAddendums(addendums); + settleTransactionRequest.setShippingTrackingDetails(shippingTrackingDetails); + return ValidationUtils.validate(super.build(settleTransactionRequest)); } } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java index 4aafd8d..050aaa3 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java @@ -511,6 +511,7 @@ protected S build(S safechargeOrderDet safechargeOrderDetailsRequest.setUserTokenId(userTokenId); safechargeOrderDetailsRequest.setClientUniqueId(clientUniqueId); safechargeOrderDetailsRequest.setAmountDetails(amountDetails); + safechargeOrderDetailsRequest.setShippingTrackingDetails(shippingTrackingDetails); safechargeOrderDetailsRequest.setChecksum( ChecksumUtils.calculateChecksum(safechargeOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", diff --git a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java index 1b90a19..57dd170 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java @@ -38,8 +38,6 @@ public abstract class SafechargeTransactionBuilder Date: Thu, 16 May 2024 11:45:20 +0300 Subject: [PATCH 32/55] pbi/be-802753-riverty-vat - item tax fields --- src/main/java/com/safecharge/model/Item.java | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/java/com/safecharge/model/Item.java b/src/main/java/com/safecharge/model/Item.java index e11578e..253fed1 100644 --- a/src/main/java/com/safecharge/model/Item.java +++ b/src/main/java/com/safecharge/model/Item.java @@ -50,6 +50,12 @@ public class Item { private String productUrl; + private String taxRate; + + private String discountRate; + + private String shippingTaxRate; + public String getName() { return name; } @@ -137,4 +143,29 @@ public String getProductUrl() { public void setProductUrl(String productUrl) { this.productUrl = productUrl; } + + + public String getTaxRate() { + return taxRate; + } + + public void setTaxRate(String taxRate) { + this.taxRate = taxRate; + } + + public String getDiscountRate() { + return discountRate; + } + + public void setDiscountRate(String discountRate) { + this.discountRate = discountRate; + } + + public String getShippingTaxRate() { + return shippingTaxRate; + } + + public void setShippingTaxRate(String shippingTaxRate) { + this.shippingTaxRate = shippingTaxRate; + } } From d3b5f8aca70880d0de5079365085b5946b2bfa4c Mon Sep 17 00:00:00 2001 From: Nurhan Mustafa Date: Thu, 30 May 2024 13:52:39 +0000 Subject: [PATCH 33/55] Merged PR 76150: Use local jFrog repository The Java SDK project was limited to use only libraries located in the local jFrog. Related work items: #752665 --- pom-internal.xml | 266 ------------------ pom.xml | 31 +- .../java/com/safecharge/biz/Safecharge.java | 2 +- 3 files changed, 26 insertions(+), 273 deletions(-) delete mode 100644 pom-internal.xml diff --git a/pom-internal.xml b/pom-internal.xml deleted file mode 100644 index acfc4a8..0000000 --- a/pom-internal.xml +++ /dev/null @@ -1,266 +0,0 @@ - - - 4.0.0 - - com.safecharge - safecharge-sdk-java - 1.7.7 - - Safecharge SDK for Java - SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s - payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is - compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. - - https://github.com/SafeChargeInternational/safecharge-java - - - SafeCharge - https://www.safecharge.com - - - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - - scm:git:git://github.com/SafeChargeInternational/safecharge-java.git - scm:git:ssh://github.com:SafeChargeInternational/safecharge-java.git - http://github.com/SafeChargeInternational/safecharge-java/tree/master - - - - org.sonatype.oss - oss-parent - 9 - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - java8-doclint-disabled - - [1.8,) - - - none - - - - - - - - . - - VERSION - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - ${gpg.keyname} - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-source-plugin - 2.3 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - ${javadoc.opts} - - - - attach-javadocs - - jar - - - - - - org.sonatype.plugins - 1.6.7 - nexus-staging-maven-plugin - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - true - true - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - - prepare-agent - - - - report - test - - report - - - - - - - - - - com.google.code.gson - gson - 2.10.1 - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - - javax.validation - validation-api - 1.1.0.Final - - - - org.apache.logging.log4j - log4j-core - 2.19.0 - compile - true - - - - org.apache.logging.log4j - log4j-jcl - 2.13.2 - compile - true - - - - - org.apache.bval - bval-jsr - 1.1.2 - compile - true - - - javax.xml.bind - jaxb-api - 2.3.1 - true - - - com.sun.xml.bind - jaxb-core - 4.0.0 - true - - - com.sun.xml.bind - jaxb-impl - 4.0.0 - true - - - - - junit - junit - 4.13.2 - test - - - - org.mockito - mockito-core - 2.28.2 - test - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index d429448..d91ae9e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,10 @@ safecharge-sdk-java 1.7.8-SNAPSHOT + + https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt + + Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s @@ -34,12 +38,6 @@ http://github.com/SafeChargeInternational/safecharge-java/tree/master - - org.sonatype.oss - oss-parent - 9 - - ossrh @@ -63,6 +61,27 @@ + + + safecharge-libs + Safecharge libraries + ${safecharge_artifactory} + + + safecharge-snapshot + Safecharge snapshot + ${safecharge_artifactory} + + + + + + safecharge-maven-plugins + Safecharge maven plugins + ${safecharge_artifactory} + + + diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 7c719eb..8f1b32c 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -105,7 +105,7 @@ private String getSessionToken() throws SafechargeException { * @param relatedTransactionId Mandatory in some flows like 3DSecure v2. * @param transactionType The type of transaction: Sale or Auth. * @param autoPayment3D Autopayment3D flag. - * @param isMoto Set this field to “1” to mark the transaction as MOTO (mail order/telephone order). + * @param isMoto Set this field to "1" to mark the transaction as MOTO (mail order/telephone order). * @param subMerchant Contains information about the SubMerchant. * @param rebillingType When performing recurring/rebilling, use this field to indicate the recurring type * @param authenticationOnlyType This field is intended for merchants using the Zero Authorisation feature. From c37c71f524a5aa192d18ef833d91f51264cb6995 Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Tue, 18 Jun 2024 09:23:53 +0000 Subject: [PATCH 34/55] Merged PR 84378: pbi/be-782968-v.1.7.8---Release update version to v.1.7.8 Related work items: #782968 --- README.md | 4 ++-- pom-github.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 214872c..3d05a9a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.7 + 1.7.8 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.7 + 1.7.8 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index dcff11e..a373a46 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.7 + 1.7.8 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index d91ae9e..c0d61ab 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.8-SNAPSHOT + 1.7.8 https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt From a4276fa76eee065d5ed7f15ea0cb99924e86064b Mon Sep 17 00:00:00 2001 From: Mikaela Zhekova Date: Thu, 20 Jun 2024 11:55:00 +0000 Subject: [PATCH 35/55] Merged PR 83772: #808861 - adds getter & setter for paymentAccountReference #What #808861 - paymentAccountReference getter & setter added #Before: ![image.png](https://dev.azure.com/nuvei/e5fb54f4-ee3d-45dd-bf91-e1ad63931dc3/_apis/git/repositories/9af0a573-46b3-47dd-b666-75b0f84b648b/pullRequests/83772/attachments/image.png) #After: ![image (2).png](https://dev.azure.com/nuvei/e5fb54f4-ee3d-45dd-bf91-e1ad63931dc3/_apis/git/repositories/9af0a573-46b3-47dd-b666-75b0f84b648b/pullRequests/83772/attachments/image%20%282%29.png) Related work items: #808861 --- .../java/com/safecharge/model/PaymentOptionResponse.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/safecharge/model/PaymentOptionResponse.java b/src/main/java/com/safecharge/model/PaymentOptionResponse.java index a1fb370..baa490f 100644 --- a/src/main/java/com/safecharge/model/PaymentOptionResponse.java +++ b/src/main/java/com/safecharge/model/PaymentOptionResponse.java @@ -30,6 +30,14 @@ public void setUserPaymentOptionId(String userPaymentOptionId) { this.userPaymentOptionId = userPaymentOptionId; } + public String getPaymentAccountReference() { + return paymentAccountReference; + } + + public void setPaymentAccountReference(String paymentAccountReference) { + this.paymentAccountReference = paymentAccountReference; + } + public CardResponse getCard() { return card; } From 045cb54a4405ecfe01597f23fdbcbf22d5210185 Mon Sep 17 00:00:00 2001 From: Miroslav Kovachev Date: Mon, 8 Jul 2024 08:01:24 +0000 Subject: [PATCH 36/55] Merged PR 84443: #808855 - Adds unreferenced refund support To keep the NotNull validation for the SettleTransaction and VoidTransaction requests I had to extract the relatedTransactionId field into every implementing class. Now in the RefundTransactionRequest the client needs to provide one of relatedTransactionId (which makes the refund referenced) or payment option with credit card information or payment option with UPO ID. That's why I introduced one more validation with the AtLeastOneFieldPresent annotation. If you think the additional validation is unnecessary I will remove it. I tested referenced and unreferenced refund with a credit card information. Related work items: #808855 --- README.md | 2 +- .../com/safecharge/biz/RequestBuilder.java | 3 +- .../java/com/safecharge/biz/Safecharge.java | 14 +-- .../safecharge/model/RefundPaymentOption.java | 32 +++++++ .../request/RefundTransactionRequest.java | 62 ++++++++++++- .../request/SafechargeTransactionRequest.java | 15 +--- .../request/SettleTransactionRequest.java | 32 ++++++- .../request/VoidTransactionRequest.java | 32 +++++++ .../builder/SafechargeTransactionBuilder.java | 7 +- .../util/AtLeastOneFieldPresent.java | 26 ++++++ .../util/AtLeastOneFieldPresentValidator.java | 86 +++++++++++++++++++ .../com/safecharge/biz/SafechargeTest.java | 35 +++++++- 12 files changed, 311 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/safecharge/model/RefundPaymentOption.java create mode 100644 src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java create mode 100644 src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java diff --git a/README.md b/README.md index 3d05a9a..1fd9ff9 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ public class Sample { MerchantInfo merchantInfo = new MerchantInfo("MERCHANT_KEY_PROVIDED_BY_SAFECHARGE", "MERCHANT_ID_PROVIDED_BY_SAFECHARGE", "MERCHANT_SITE_ID_PROVIDED_BY_SAFECHARGE", APIConstants.INTEGRATION_HOST, Constants.HashAlgorithm.SHA256); - SafechargeRequest safechargeRequest = GetSessionTokenRequest.builder() + SafechargeBaseRequest safechargeRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index 1b9d963..e646a5a 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -217,7 +217,7 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails) { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -234,6 +234,7 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me .addRelatedTransactionId(relatedTransactionId) .addSubMerchant(subMerchant) .addCompanyDetails(companyDetails) + .addRefundPaymentOption(refundPaymentOption) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 8f1b32c..9977173 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -399,16 +399,18 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. * @throws SafechargeException if there are request related problems. */ - public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, UrlDetails urlDetails, - String amount, String authCode, String comment, String currency, String customData, - String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails) throws SafechargeException { + public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, + UrlDetails urlDetails, + String amount, String authCode, String comment, String currency, String customData, + String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, + SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, + clientUniqueId, clientRequestId, urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, - relatedTransactionId, subMerchant, companyDetails); + relatedTransactionId, subMerchant, companyDetails, refundPaymentOption); return (RefundTransactionResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/model/RefundPaymentOption.java b/src/main/java/com/safecharge/model/RefundPaymentOption.java new file mode 100644 index 0000000..2146e1c --- /dev/null +++ b/src/main/java/com/safecharge/model/RefundPaymentOption.java @@ -0,0 +1,32 @@ +package com.safecharge.model; + +import javax.validation.Valid; +import javax.validation.constraints.Size; + +import com.safecharge.util.AtLeastOneFieldPresent; + +@AtLeastOneFieldPresent(fields = {"card", "userPaymentOptionId"}, message = "Either \"card\" or \"userPaymentOptionId\" must be defined") +public class RefundPaymentOption { + @Valid + private CardData card; + + @Size(max = 45) + private String userPaymentOptionId; + + public CardData getCard() { + return card; + } + + public void setCard(CardData card) { + this.card = card; + } + + public String getUserPaymentOptionId() { + return userPaymentOptionId; + } + + public void setUserPaymentOptionId(String userPaymentOptionId) { + this.userPaymentOptionId = userPaymentOptionId; + } + +} diff --git a/src/main/java/com/safecharge/request/RefundTransactionRequest.java b/src/main/java/com/safecharge/request/RefundTransactionRequest.java index a222d79..8f95f7c 100644 --- a/src/main/java/com/safecharge/request/RefundTransactionRequest.java +++ b/src/main/java/com/safecharge/request/RefundTransactionRequest.java @@ -5,8 +5,12 @@ package com.safecharge.request; import javax.validation.ConstraintViolationException; +import javax.validation.Valid; +import javax.validation.constraints.Size; +import com.safecharge.model.RefundPaymentOption; import com.safecharge.request.builder.SafechargeTransactionBuilder; +import com.safecharge.util.AtLeastOneFieldPresent; import com.safecharge.util.Constants; import com.safecharge.util.ValidChecksum; import com.safecharge.util.ValidationUtils; @@ -25,6 +29,8 @@ * @since 3/20/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.REFUND_GW_TRANSACTION) +@AtLeastOneFieldPresent(fields = { "paymentOption", "relatedTransactionId" }, + message = "Either \"paymentOption\" or \"relatedTransactionId\" must be defined") public class RefundTransactionRequest extends SafechargeTransactionRequest { @@ -32,6 +38,36 @@ public static Builder builder() { return new Builder(); } + /** + * Card or user payment option information for unreferenced refunds + */ + @Valid + private RefundPaymentOption paymentOption; + + /** + * The ID of the original auth transaction. + */ + @Size(max = 19) + private String relatedTransactionId; + + public RefundPaymentOption getPaymentOption() { + return paymentOption; + } + + public void setPaymentOption(RefundPaymentOption paymentOption) { + this.paymentOption = paymentOption; + } + + @Override + public String getRelatedTransactionId() { + return relatedTransactionId; + } + + @Override + public void setRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("RefundTransactionRequest{"); @@ -42,6 +78,26 @@ public String toString() { public static class Builder extends SafechargeTransactionBuilder { + private RefundPaymentOption refundPaymentOption; + private String relatedTransactionId; + + /** + * Adds RefundPaymentOption to request builder for unreferenced refunds. + * + * @param refundPaymentOption card or user payment option information for the refund + * @return this object + */ + public Builder addRefundPaymentOption(RefundPaymentOption refundPaymentOption) { + this.refundPaymentOption = refundPaymentOption; + return this; + } + + @Override + public Builder addRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + return this; + } + /** * Builds the request. * @@ -50,8 +106,10 @@ public static class Builder extends SafechargeTransactionBuilder { */ @Override public SafechargeBaseRequest build() throws ConstraintViolationException { - RefundTransactionRequest voidTransactionRequest = new RefundTransactionRequest(); - return ValidationUtils.validate(super.build(voidTransactionRequest)); + RefundTransactionRequest refundTransactionRequest = new RefundTransactionRequest(); + refundTransactionRequest.setPaymentOption(refundPaymentOption); + refundTransactionRequest.setRelatedTransactionId(relatedTransactionId); + return ValidationUtils.validate(super.build(refundTransactionRequest)); } } diff --git a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java index c16c797..c00203b 100644 --- a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java +++ b/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java @@ -52,12 +52,6 @@ public abstract class SafechargeTransactionRequest extends SafechargeRequest { @Size(max = 45, message = "clientUniqueId size must be up to 45 characters long!") protected String clientUniqueId; - /** - * The ID of the original auth transaction. - */ - @NotNull(message = "relatedTransactionId parameter is mandatory!") - protected String relatedTransactionId; - /** * URLs to redirect to in case of success, failure, etc. Also URL to send the direct merchant notification(DMN) message to. */ @@ -121,13 +115,9 @@ public void setClientUniqueId(String clientUniqueId) { this.clientUniqueId = clientUniqueId; } - public String getRelatedTransactionId() { - return relatedTransactionId; - } + public abstract String getRelatedTransactionId(); - public void setRelatedTransactionId(String relatedTransactionId) { - this.relatedTransactionId = relatedTransactionId; - } + public abstract void setRelatedTransactionId(String relatedTransactionId); public UrlDetails getUrlDetails() { return urlDetails; @@ -193,7 +183,6 @@ public String toString() { sb.append(", authCode='").append(authCode).append('\''); sb.append(", comment='").append(comment).append('\''); sb.append(", clientUniqueId='").append(clientUniqueId).append('\''); - sb.append(", relatedTransactionId='").append(relatedTransactionId).append('\''); sb.append(", urlDetails=").append(urlDetails); sb.append(", customSiteName='").append(customSiteName).append('\''); sb.append(", productId='").append(productId).append('\''); diff --git a/src/main/java/com/safecharge/request/SettleTransactionRequest.java b/src/main/java/com/safecharge/request/SettleTransactionRequest.java index be6133c..bb399fd 100644 --- a/src/main/java/com/safecharge/request/SettleTransactionRequest.java +++ b/src/main/java/com/safecharge/request/SettleTransactionRequest.java @@ -6,6 +6,7 @@ import javax.validation.ConstraintViolationException; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import com.safecharge.model.Addendums; @@ -42,6 +43,13 @@ public class SettleTransactionRequest @Valid private Addendums addendums; + /** + * The ID of the original auth transaction. + */ + @NotNull(message = "relatedTransactionId parameter is mandatory!") + @Size(max = 19) + private String relatedTransactionId; + public static Builder builder() { return new Builder(); } @@ -70,14 +78,27 @@ public void setAddendums(Addendums addendums) { this.addendums = addendums; } + public String getRelatedTransactionId() { + return relatedTransactionId; + } + + public void setRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("SettleTransactionRequest{"); sb.append("descriptorMerchantName='") .append(descriptorMerchantName) + .append('\'') + .append(", descriptorMerchantPhone='") + .append(descriptorMerchantPhone) + .append('\'') + .append(", relatedTransactionId='") + .append(relatedTransactionId) .append('\''); - sb.append(", descriptorMerchantPhone='") - .append(descriptorMerchantPhone); + sb.append(", ") .append(super.toString()); sb.append('}'); @@ -92,6 +113,7 @@ public static class Builder extends SafechargeTransactionBuilder { private Addendums addendums; private ShippingTrackingDetails shippingTrackingDetails; + private String relatedTransactionId; /** * Sets the Descriptor merchant name in the request. @@ -147,6 +169,11 @@ public Builder addShippingTrackingDetails(ShippingTrackingDetails shippingTracki return this; } + @Override + public Builder addRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + return this; + } /** * Builds the request. * @@ -160,6 +187,7 @@ public SafechargeBaseRequest build() throws ConstraintViolationException { settleTransactionRequest.setDescriptorMerchantPhone(descriptorMerchantPhone); settleTransactionRequest.setAddendums(addendums); settleTransactionRequest.setShippingTrackingDetails(shippingTrackingDetails); + settleTransactionRequest.setRelatedTransactionId(relatedTransactionId); return ValidationUtils.validate(super.build(settleTransactionRequest)); } diff --git a/src/main/java/com/safecharge/request/VoidTransactionRequest.java b/src/main/java/com/safecharge/request/VoidTransactionRequest.java index b104df2..c562760 100644 --- a/src/main/java/com/safecharge/request/VoidTransactionRequest.java +++ b/src/main/java/com/safecharge/request/VoidTransactionRequest.java @@ -5,6 +5,8 @@ package com.safecharge.request; import javax.validation.ConstraintViolationException; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import com.safecharge.request.builder.SafechargeTransactionBuilder; import com.safecharge.util.Constants; @@ -27,6 +29,21 @@ public class VoidTransactionRequest extends SafechargeTransactionRequest { + /** + * The ID of the original auth transaction. + */ + @NotNull(message = "relatedTransactionId parameter is mandatory!") + @Size(max = 19) + private String relatedTransactionId; + + public String getRelatedTransactionId() { + return relatedTransactionId; + } + + public void setRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + } + public static Builder builder() { return new Builder(); } @@ -41,6 +58,19 @@ public String toString() { public static class Builder extends SafechargeTransactionBuilder { + private String relatedTransactionId; + + /** + * Adds related transaction id to the request. + * + * @param relatedTransactionId the related transaction id to add to the request + * @return this object + */ + public Builder addRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + return this; + } + /** * Builds the request. * @@ -50,6 +80,8 @@ public static class Builder extends SafechargeTransactionBuilder { @Override public VoidTransactionRequest build() throws ConstraintViolationException { VoidTransactionRequest voidTransactionRequest = new VoidTransactionRequest(); + voidTransactionRequest.setRelatedTransactionId(relatedTransactionId); + return ValidationUtils.validate(super.build(voidTransactionRequest)); } } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java index 57dd170..e5fc2c3 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java +++ b/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java @@ -30,7 +30,6 @@ public abstract class SafechargeTransactionBuilder S build(S safechargeTransacti safechargeTransactionRequest.setAuthCode(authCode); safechargeTransactionRequest.setComment(comment); safechargeTransactionRequest.setClientUniqueId(clientUniqueId); - safechargeTransactionRequest.setRelatedTransactionId(relatedTransactionId); safechargeTransactionRequest.setUrlDetails(urlDetails); safechargeTransactionRequest.setCustomSiteName(customSiteName); safechargeTransactionRequest.setProductId(productId); diff --git a/src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java b/src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java new file mode 100644 index 0000000..aa3155d --- /dev/null +++ b/src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java @@ -0,0 +1,26 @@ +package com.safecharge.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; + +@Constraint(validatedBy = AtLeastOneFieldPresentValidator.class) +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +public @interface AtLeastOneFieldPresent { + + String message(); + Class[] groups() default {}; + Class[] payload() default {}; + String[] fields(); + + @Target({ ElementType.TYPE }) + @Retention(RetentionPolicy.RUNTIME) + @interface List { + AtLeastOneFieldPresent[] value(); + } +} diff --git a/src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java b/src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java new file mode 100644 index 0000000..1936e2c --- /dev/null +++ b/src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java @@ -0,0 +1,86 @@ +package com.safecharge.util; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +public class AtLeastOneFieldPresentValidator implements ConstraintValidator { + + private String[] fieldNames; + + @Override + public void initialize(AtLeastOneFieldPresent constraintAnnotation) { + this.fieldNames = constraintAnnotation.fields(); + } + + @Override + public boolean isValid(Object value, ConstraintValidatorContext context) { + try { + for (String fieldName : fieldNames) { + Object fieldValue = getFieldValue(value, fieldName); + if (fieldValue != null) { + if (fieldValue instanceof String) { + if (!((String) fieldValue).isEmpty()) { + return true; + } + } else { + return true; + } + } + } + return false; + } catch (Exception e) { + //not stopping the request in case there is a bug here + return true; + } + } + + private Object getFieldValue(Object object, String fieldName) throws Exception { + Class clazz = object.getClass(); + + // Try to find a getter method for the field + Method getter = findGetter(clazz, fieldName); + if (getter != null) { + return getter.invoke(object); + } + + // Try to find the field in the class hierarchy + Field field = findField(clazz, fieldName); + if (field != null) { + field.setAccessible(true); + return field.get(object); + } + + return null; + } + + private Method findGetter(Class clazz, String fieldName) { + String capitalizedFieldName = Character.toUpperCase(fieldName.charAt(0)) + fieldName.substring(1); + String getterName = "get" + capitalizedFieldName; + String booleanGetterName = "is" + capitalizedFieldName; + try { + return clazz.getMethod(getterName); + } catch (NoSuchMethodException e) { + // Try boolean getter + try { + return clazz.getMethod(booleanGetterName); + } catch (NoSuchMethodException ignored) { + // No getter found + } + } + return null; + } + + private Field findField(Class clazz, String fieldName) { + while (clazz != null) { + try { + return clazz.getDeclaredField(fieldName); + } catch (NoSuchFieldException e) { + clazz = clazz.getSuperclass(); + } + } + return null; + } +} diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index dbdfad7..68a6fbe 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -18,6 +18,8 @@ import com.safecharge.exception.SafechargeConfigurationException; import com.safecharge.exception.SafechargeException; +import com.safecharge.model.CardData; +import com.safecharge.model.RefundPaymentOption; import com.safecharge.request.AccountCaptureRequest; import com.safecharge.request.Authorize3dRequest; import com.safecharge.request.CardDetailsRequest; @@ -240,7 +242,7 @@ public void shouldExecuteVoidTransactionRequestAndReturnResponse() throws Safech when(executor.execute(any(VoidTransactionRequest.class))).thenReturn(voidTransactionResponse); sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); - VoidTransactionResponse response = sut.voidTransaction("clientRequestId", "relatedTransactionId", "11", "BGN", "authCode", + VoidTransactionResponse response = sut.voidTransaction("clientRequestId", "relatedTransactioId", "11", "BGN", "authCode", null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); @@ -272,7 +274,7 @@ public void shouldExecuteSettleTransactionRequestAndReturnResponse() throws Safe sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); SettleTransactionResponse response = sut.settleTransaction("clientUniqueId", "clientRequestId", null, null, null, null, "11", - "authCode", null, null, "BGN", null, null, "relatedTransactionId", null, null); + "authCode", null, null, "BGN", null, null, "relatedTransactioId", null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(SettleTransactionRequest.class)); @@ -303,7 +305,32 @@ public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws Safe sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); RefundTransactionResponse response = sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactionId", null, null); + null, null, null, "relatedTransactioId", null, null, null); + + verify(executor).execute(any(GetSessionTokenRequest.class)); + verify(executor).execute(any(RefundTransactionRequest.class)); + verifyNoMoreInteractions(executor); + verify(sessionResponse).getStatus(); + verify(sessionResponse).getSessionToken(); + assertNotNull(response); + } + + @Test + public void shouldExecuteUnreferencedRefundTransactionRequestAndReturnResponse() throws SafechargeException { + SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); + + SafechargeResponse refundTransactionResponse = new RefundTransactionResponse(); + + when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); + when(executor.execute(any(RefundTransactionRequest.class))).thenReturn(refundTransactionResponse); + + sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); + RefundPaymentOption refundPaymentOption = new RefundPaymentOption(); + refundPaymentOption.setCard(new CardData()); + RefundTransactionResponse response = sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", + "authCode", null, "BGN", + null, null, null, null, null, null, refundPaymentOption); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -319,7 +346,7 @@ public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutIni exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactionId", null, null); + null, null, null, "relatedTransactionId", null, null, null); } @Test From 817915b6836460962558513d0664bf7e6e03deb3 Mon Sep 17 00:00:00 2001 From: Bozhidar Banchev Date: Thu, 25 Jul 2024 08:08:25 +0000 Subject: [PATCH 37/55] Merged PR 88783: pbi/be-836472-1.7.9-release new version 1.7.9 Related work items: #836472 --- README.md | 4 ++-- pom-github.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1fd9ff9..ac024dd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.8 + 1.7.9 ``` @@ -32,7 +32,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.8 + 1.7.9 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index a373a46..f711556 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.8 + 1.7.9 Safecharge SDK for Java SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, diff --git a/pom.xml b/pom.xml index c0d61ab..4f3a9fb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.8 + 1.7.9 https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt From 3f24cbf0173d390008dd9c2c10078f1305c0157a Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Fri, 26 Jul 2024 14:15:43 +0300 Subject: [PATCH 38/55] pbi/be-836472-revert-sonatype-dependency --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 4f3a9fb..985427c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,12 @@ http://github.com/SafeChargeInternational/safecharge-java/tree/master + + org.sonatype.oss + oss-parent + 9 + + ossrh From 4f26c1b32c3deb5d2ac9ca52f55266b78a57bac5 Mon Sep 17 00:00:00 2001 From: Mikaela Zhekova Date: Wed, 28 Aug 2024 12:20:29 +0000 Subject: [PATCH 39/55] Merged PR 92378: [856693] [JAVA SDK] UPOID error for refund transaction #856693 adds **userTokenId** to JAVA SDK refundTransactionRequest #Tested locally with: SafechargeRequestExecutor requestExecutor = SafechargeRequestExecutor.getInstance(); MerchantInfo merchantInfo = new MerchantInfo("vRZsQfFAey7c9sElV0QGIiKua6EDDHDEi8nJTZ11XQK9pMLJ4cB3w6vHeDH5KC74", "3865149424377641344", "37341", "http://localhost:8080/ppp/", Constants.HashAlgorithm.MD5); UrlDetails urlDetails = new UrlDetails(); urlDetails.setNotificationUrl(""); String clientRequestId = RequestUtils.calculateClientRequestId(RequestUtils.calculateTimestamp()); RefundPaymentOption refundPaymentOption = new RefundPaymentOption(); refundPaymentOption.setUserPaymentOptionId("7063075"); SafechargeBaseRequest request = RefundTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addAmount("10") .addCurrency("EUR") .addRefundPaymentOption(refundPaymentOption) .addUserTokenId("blkakadsf") .addClientRequestId(clientRequestId) .addURLDetails(urlDetails) .build(); SafechargeResponse response = requestExecutor.executeRequest(request); System.out.println(response); Result: RefundTransactionResponse{merchantAdviceCode='',transactionId='2110000000014943016', externalTransactionId='', userPaymentOptionId=7063075, paymentMethodErrorCode=null, paymentMethodErrorReason='null', gwErrorCode=0, gwErrorReason='null', gwExtendedErrorCode=0, **transactionStatus='APPROVED'**, authCode='004882', paRequest='null', redirectUrl='null', eci='null', threeDReason='null', threeDFlow='null', externalTokenInfo='null', partialApprovalDetails='null', cvv2Replay='null', avsCode='null', transactionType='Credit', customData='', fraudDetails='null', acquirerId='103', bin='476134', last4Digits='1390', ccCardNumber='4****1390', ccExpMonth='12', cardType='Credit', cardBrand='VISA', issuerCountry='SG', methodUrl='null', threeDSVersion='null', v2supported='null', methodPayload='null', acsChallengeMandated='null', cReq='null', authenticationType='null', cardHolderInfoText='null', whiteListStatus='null', cavv='null', directoryServerId='null', directoryServerPublicKey='null', acsSignedContent='null', serverTransId='null', xid='null', threeDresult='null', dsTransID='null', threeDReasonId='null', challengeCancelReasonId='null', challengeCancelReason='null', isLiabilityOnIssuer='null', isExemptionRequestInAuthentication='null', challengePreferenceReason='null', internalRequestId=1510461, **status=SUCCESS**, errCode=0, reason='', merchantId='3865149424377641344', merchantSiteId='37341', version='1.0', clientRequestId='1724418612000', sessionToken='null', clientUniqueId='null', errorType=null, apiType=null, hint=null} Related work items: #856693, #860440, #860441 --- .../com/safecharge/biz/RequestBuilder.java | 3 +- .../java/com/safecharge/biz/Safecharge.java | 4 +-- .../request/RefundTransactionRequest.java | 28 +++++++++++++++++++ .../com/safecharge/biz/SafechargeTest.java | 6 ++-- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index e646a5a..dab6720 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -217,7 +217,7 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption) { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -235,6 +235,7 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me .addSubMerchant(subMerchant) .addCompanyDetails(companyDetails) .addRefundPaymentOption(refundPaymentOption) + .addUserTokenId(userTokenId) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 9977173..e61e98d 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -403,14 +403,14 @@ public RefundTransactionResponse refundTransaction(String clientUniqueId, String UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption) throws SafechargeException { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, - relatedTransactionId, subMerchant, companyDetails, refundPaymentOption); + relatedTransactionId, subMerchant, companyDetails, refundPaymentOption, userTokenId); return (RefundTransactionResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/RefundTransactionRequest.java b/src/main/java/com/safecharge/request/RefundTransactionRequest.java index 8f95f7c..05fbf63 100644 --- a/src/main/java/com/safecharge/request/RefundTransactionRequest.java +++ b/src/main/java/com/safecharge/request/RefundTransactionRequest.java @@ -44,12 +44,19 @@ public static Builder builder() { @Valid private RefundPaymentOption paymentOption; + /** + * Used for unreferenced refunds (for connecting and validating the UPO). + */ + @Size(max = 255, message = "userTokenId size must be up to 255 characters long!") + private String userTokenId; + /** * The ID of the original auth transaction. */ @Size(max = 19) private String relatedTransactionId; + public RefundPaymentOption getPaymentOption() { return paymentOption; } @@ -58,6 +65,14 @@ public void setPaymentOption(RefundPaymentOption paymentOption) { this.paymentOption = paymentOption; } + public String getUserTokenId() { + return userTokenId; + } + + public void setUserTokenId(String userTokenId) { + this.userTokenId = userTokenId; + } + @Override public String getRelatedTransactionId() { return relatedTransactionId; @@ -79,6 +94,7 @@ public String toString() { public static class Builder extends SafechargeTransactionBuilder { private RefundPaymentOption refundPaymentOption; + private String userTokenId; private String relatedTransactionId; /** @@ -92,6 +108,17 @@ public Builder addRefundPaymentOption(RefundPaymentOption refundPaymentOption) { return this; } + /** + * Adds userTokenId to request builder for unreferenced refunds. + * + * @param userTokenId used for connecting and validating the UPO. + * @return this object + */ + public Builder addUserTokenId(String userTokenId) { + this.userTokenId = userTokenId; + return this; + } + @Override public Builder addRelatedTransactionId(String relatedTransactionId) { this.relatedTransactionId = relatedTransactionId; @@ -108,6 +135,7 @@ public Builder addRelatedTransactionId(String relatedTransactionId) { public SafechargeBaseRequest build() throws ConstraintViolationException { RefundTransactionRequest refundTransactionRequest = new RefundTransactionRequest(); refundTransactionRequest.setPaymentOption(refundPaymentOption); + refundTransactionRequest.setUserTokenId(userTokenId); refundTransactionRequest.setRelatedTransactionId(relatedTransactionId); return ValidationUtils.validate(super.build(refundTransactionRequest)); } diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index 68a6fbe..8c7fede 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -305,7 +305,7 @@ public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws Safe sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); RefundTransactionResponse response = sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactioId", null, null, null); + null, null, null, "relatedTransactioId", null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -330,7 +330,7 @@ public void shouldExecuteUnreferencedRefundTransactionRequestAndReturnResponse() refundPaymentOption.setCard(new CardData()); RefundTransactionResponse response = sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, null, null, null, refundPaymentOption); + null, null, null, null, null, null, refundPaymentOption, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -346,7 +346,7 @@ public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutIni exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", - null, null, null, "relatedTransactionId", null, null, null); + null, null, null, "relatedTransactionId", null, null, null, null); } @Test From 4bda6484d966b8f2a6de2ff07f156cd4300c4b60 Mon Sep 17 00:00:00 2001 From: "radostin.tonev" Date: Wed, 28 Aug 2024 15:24:56 +0300 Subject: [PATCH 40/55] Update to version 1.7.10 --- README.md | 5 ++--- pom.xml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ac024dd..b47309e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # SafeCharge REST API SDK for Java. [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.safecharge/safecharge-sdk-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.safecharge/safecharge-sdk-java) -[![Build Status](https://travis-ci.org/SafeChargeInternational/safecharge-java.svg?branch=master)](https://travis-ci.org/SafeChargeInternational/safecharge-java) [![codecov](https://codecov.io/gh/SafeChargeInternational/safecharge-java/branch/development/graph/badge.svg)](https://codecov.io/gh/SafeChargeInternational/safecharge-java) SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. For SafeCharge REST API documentation, please see: https://www.safecharge.com/docs/api/ @@ -18,7 +17,7 @@ If your application is going to be deployed on a Java EE server add the followin com.safecharge safecharge-sdk-java - 1.7.9 + 1.7.10 ``` @@ -32,7 +31,7 @@ For example: com.safecharge safecharge-sdk-java - 1.7.9 + 1.7.10 org.apache.bval diff --git a/pom.xml b/pom.xml index 985427c..29acaf0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.safecharge safecharge-sdk-java - 1.7.9 + 1.7.10 https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt From ada5558ebb23c4db217d13a07f60d36e17fbd9f2 Mon Sep 17 00:00:00 2001 From: Yoanna Evgenieva Date: Wed, 11 Sep 2024 07:53:52 +0000 Subject: [PATCH 41/55] Merged PR 91126: Support sg_NotUseCVV in payment Support sg_NotUseCVV in payment Depends on !90952 Related work items: #866490, #866494 --- .../com/safecharge/biz/RequestBuilder.java | 4 +++- .../java/com/safecharge/biz/Safecharge.java | 5 +++-- .../safecharge/request/PaymentRequest.java | 20 ++++++++++++++++++- .../com/safecharge/biz/SafechargeTest.java | 4 ++-- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index dab6720..dc2e22f 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -29,7 +29,8 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, - RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { + RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String cvvNotUsed) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -70,6 +71,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .addRecipientDetails(recipientDetails) .addCompanyDetails(companyDetails) .addShippingTrackingDetails(shippingTrackingDetails) + .addCvvNotUsed(cvvNotUsed) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index e61e98d..5677db5 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -131,7 +131,8 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, - String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { + String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String cvvNotUsed) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -139,7 +140,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed); return (PaymentResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/PaymentRequest.java b/src/main/java/com/safecharge/request/PaymentRequest.java index efb8476..d4b7e4a 100644 --- a/src/main/java/com/safecharge/request/PaymentRequest.java +++ b/src/main/java/com/safecharge/request/PaymentRequest.java @@ -20,6 +20,8 @@ public class PaymentRequest extends Authorize3dAndPaymentRequest { private String isMoto; + private String cvvNotUsed; + public String getIsMoto() { return isMoto; } @@ -28,6 +30,14 @@ public void setIsMoto(String isMoto) { this.isMoto = isMoto; } + public String getCvvNotUsed() { + return cvvNotUsed; + } + + public void setCvvNotUsed(String cvvNotUsed) { + this.cvvNotUsed = cvvNotUsed; + } + public static Builder builder() { return new Builder(); } @@ -38,7 +48,8 @@ public String toString() { sb.append("paymentOption=").append(getPaymentOption()) .append(", isRebilling=").append(getIsRebilling()) .append(", isMoto=").append(getIsMoto()) - .append(", autoPayment3D=").append(isAutoPayment3D()); + .append(", autoPayment3D=").append(isAutoPayment3D()) + .append(", cvvNotUsed=").append(cvvNotUsed); sb.append(super.toString()); sb.append('}'); @@ -48,12 +59,18 @@ public String toString() { public static class Builder extends Authorize3dAndPaymentRequest.Builder { private String isMoto; + private String cvvNotUsed; public Builder addIsMoto(String isMoto) { this.isMoto = isMoto; return this; } + public Builder addCvvNotUsed(String cvvNotUsed) { + this.cvvNotUsed = cvvNotUsed; + return this; + } + /** * {@inheritDoc} */ @@ -61,6 +78,7 @@ public Builder addIsMoto(String isMoto) { public PaymentRequest build() { PaymentRequest request = new PaymentRequest(); request.setIsMoto(isMoto); + request.setCvvNotUsed(cvvNotUsed); return ValidationUtils.validate(super.build(request)); } diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/safecharge/biz/SafechargeTest.java index 8c7fede..26039e0 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/safecharge/biz/SafechargeTest.java @@ -115,7 +115,7 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeExce PaymentResponse response = sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(PaymentRequest.class)); @@ -133,7 +133,7 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null); } @Test From c4c6977449f76ce21de613361769fbcd9d55db7c Mon Sep 17 00:00:00 2001 From: Yoanna Evgenieva Date: Wed, 18 Sep 2024 10:43:07 +0000 Subject: [PATCH 42/55] Merged PR 94520: Support serviceDueDate in payment Support `serviceDueDate` in payment Tested locally with Java SDK Automation test for payment. Related work items: #824245, #824250 --- .../java/com/safecharge/biz/RequestBuilder.java | 3 ++- src/main/java/com/safecharge/biz/Safecharge.java | 6 ++++-- .../com/safecharge/request/PaymentRequest.java | 16 +++++++++++++++- .../java/com/safecharge/biz/SafechargeTest.java | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/safecharge/biz/RequestBuilder.java index dc2e22f..e8505b3 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/safecharge/biz/RequestBuilder.java @@ -30,7 +30,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed) { + String cvvNotUsed, String serviceDueDate) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -72,6 +72,7 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .addCompanyDetails(companyDetails) .addShippingTrackingDetails(shippingTrackingDetails) .addCvvNotUsed(cvvNotUsed) + .addServiceDueDate(serviceDueDate) .build(); } diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/safecharge/biz/Safecharge.java index 5677db5..1e5ff33 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/safecharge/biz/Safecharge.java @@ -119,6 +119,8 @@ private String getSessionToken() throws SafechargeException { * @param recipientDetails This class is relevant for Visa’s AFTs, and contains the details of the recipient receiving the funding. * @param companyDetails Holds information about company taxId. * @param shippingTrackingDetails Holds information about shippingTrackingDetails. + * @param cvvNotUsed Flag if CVV is not used + * @param serviceDueDate Subscription end date * @return Passes through the response from Safecharge's REST API. * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. @@ -132,7 +134,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed) throws SafechargeException { + String cvvNotUsed, String serviceDueDate) throws SafechargeException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -140,7 +142,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate); return (PaymentResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/safecharge/request/PaymentRequest.java b/src/main/java/com/safecharge/request/PaymentRequest.java index d4b7e4a..5c70f6a 100644 --- a/src/main/java/com/safecharge/request/PaymentRequest.java +++ b/src/main/java/com/safecharge/request/PaymentRequest.java @@ -22,6 +22,8 @@ public class PaymentRequest extends Authorize3dAndPaymentRequest { private String cvvNotUsed; + private String serviceDueDate; + public String getIsMoto() { return isMoto; } @@ -38,6 +40,10 @@ public void setCvvNotUsed(String cvvNotUsed) { this.cvvNotUsed = cvvNotUsed; } + public String getServiceDueDate() { return serviceDueDate; } + + public void setServiceDueDate(String serviceDueDate) { this.serviceDueDate = serviceDueDate; } + public static Builder builder() { return new Builder(); } @@ -49,7 +55,8 @@ public String toString() { .append(", isRebilling=").append(getIsRebilling()) .append(", isMoto=").append(getIsMoto()) .append(", autoPayment3D=").append(isAutoPayment3D()) - .append(", cvvNotUsed=").append(cvvNotUsed); + .append(", cvvNotUsed=").append(cvvNotUsed) + .append(", serviceDueDate=").append(getServiceDueDate()); sb.append(super.toString()); sb.append('}'); @@ -60,6 +67,7 @@ public static class Builder extends Authorize3dAndPaymentRequest.Builder Date: Fri, 1 Nov 2024 13:11:42 +0000 Subject: [PATCH 43/55] Merged PR 99659: Change Safecharge to Nuvei reference Change Safecharge to Nuvei reference Related work items: #437452 --- LICENSE | 2 +- README.md | 52 ++-- pom-github.xml | 18 +- pom-internal.xml | 0 pom.xml | 24 +- .../Safecharge.java => nuvei/biz/Nuvei.java} | 264 +++++++++--------- .../biz/NuveiClientBuilder.java} | 36 +-- .../biz/NuveiHttpClient.java} | 28 +- .../biz/NuveiRequestExecutor.java} | 82 +++--- .../biz/RequestBuilder.java | 126 ++++----- .../java/com/nuvei/biz/ServiceFactory.java | 12 + .../biz/simple/payment/SimpleAPMPayment.java | 36 +-- .../payment/SimpleCreditCardPayment.java | 40 +-- .../NuveiConfigurationException.java | 24 ++ .../com/nuvei/exception/NuveiException.java | 15 + .../{safecharge => nuvei}/model/Account.java | 4 +- .../{safecharge => nuvei}/model/Acquirer.java | 4 +- .../model/Addendums.java | 6 +- .../model/AddendumsAirlines.java | 6 +- .../AddendumsAirlinesFlightLegDetails.java | 6 +- .../AddendumsAirlinesPassengerDetails.java | 6 +- .../AddendumsAirlinesReservationDetails.java | 6 +- .../AddendumsCardPresentPointOfSale.java | 6 +- .../model/AddendumsLocalPayment.java | 6 +- .../model/AmountDetails.java | 4 +- .../model/AmountInfo.java | 4 +- .../model/ApiExternalToken.java | 6 +- .../model/AssuranceDetails.java | 4 +- .../model/BasePaymentOption.java | 4 +- .../model/BillingAddress.java | 4 +- .../model/BrowserDetails.java | 4 +- .../com/{safecharge => nuvei}/model/Card.java | 4 +- .../{safecharge => nuvei}/model/CardData.java | 8 +- .../model/CardResponse.java | 6 +- .../model/CashierPaymentMethodDetails.java | 10 +- .../model/CommonUserDetailsInfo.java | 4 +- .../model/CompanyDetails.java | 2 +- .../model/CurrencyConversion.java | 4 +- .../model/DeviceDetails.java | 8 +- .../model/DynamicDescriptor.java | 8 +- .../model/ExternalMpi.java | 4 +- .../model/ExternalSchemeDetails.java | 4 +- .../model/ExternalToken.java | 4 +- .../model/ExternalTokenInfo.java | 4 +- .../model/ExternalTokenProvider.java | 4 +- .../{safecharge => nuvei}/model/Field.java | 6 +- .../model/FraudDetails.java | 4 +- .../model/FraudDetailsSystem.java | 4 +- .../model/FraudRule.java | 4 +- .../model/InitPaymentCard.java | 4 +- .../model/InitPaymentPaymentOption.java | 4 +- .../model/InitPaymentThreeD.java | 4 +- .../com/{safecharge => nuvei}/model/Item.java | 6 +- .../model/LocalizationMessage.java | 6 +- .../model/MerchantBaseInfo.java | 12 +- .../model/MerchantDetails.java | 6 +- .../model/MerchantInfo.java | 16 +- .../model/OpenAmount.java | 4 +- .../model/OpenOrderCard.java | 6 +- .../model/OpenOrderPaymentOption.java | 4 +- .../model/OpenOrderThreeD.java | 4 +- .../OpenOrderThreeDV2AdditionalParams.java | 4 +- .../model/PartialApprovalDetails.java | 4 +- ...aymentDetailsAlternativePaymentMethod.java | 4 +- .../model/PaymentDetailsCard.java | 4 +- .../model/PaymentDetailsPaymentOption.java | 4 +- .../model/PaymentDetailsThreeD.java | 4 +- .../model/PaymentInfo.java | 4 +- .../model/PaymentMethod.java | 6 +- .../model/PaymentMethodDetails.java | 4 +- .../model/PaymentOption.java | 4 +- .../model/PaymentOptionResponse.java | 4 +- .../{safecharge => nuvei}/model/Proxy.java | 8 +- .../com/{safecharge => nuvei}/model/Rate.java | 4 +- .../model/RateByCurrency.java | 4 +- .../model/RecipientDetails.java | 4 +- .../model/RefundPaymentOption.java | 4 +- .../model/RestApiUserDetails.java | 6 +- .../{safecharge => nuvei}/model/RiskInfo.java | 2 +- .../com/{safecharge => nuvei}/model/Sdk.java | 4 +- .../model/SdkResponse.java | 4 +- .../model/ShippingTrackingDetails.java | 2 +- .../model/StoredCredentials.java | 4 +- .../model/SubMerchant.java | 4 +- .../model/SubMethod.java | 4 +- .../model/SubMethodDetails.java | 6 +- .../model/SubscriptionPlan.java | 6 +- .../model/SubscriptionsListElement.java | 6 +- .../{safecharge => nuvei}/model/ThreeD.java | 4 +- .../model/TokenizationData.java | 4 +- .../model/UrlDetails.java | 10 +- .../model/UserAddress.java | 8 +- .../model/UserDetails.java | 10 +- .../model/UserDetailsCashier.java | 8 +- .../model/UserPaymentOption.java | 6 +- .../model/V2AdditionalParams.java | 4 +- .../model/Verify3dCard.java | 4 +- .../model/Verify3dPaymentOption.java | 4 +- .../model/Verify3dThreeD.java | 4 +- .../request/AccountCaptureRequest.java | 22 +- .../request/AddUPOAPMRequest.java | 34 +-- .../AddUPOCreditCardByTempTokenRequest.java | 32 +-- .../AddUPOCreditCardByTokenRequest.java | 28 +- .../request/AddUPOCreditCardRequest.java | 30 +- .../request/Authorization3DRequest.java | 30 +- .../request/Authorize3dAndPaymentRequest.java | 12 +- .../request/Authorize3dRequest.java | 12 +- .../request/CancelSubscriptionRequest.java | 26 +- .../request/CardDetailsRequest.java | 20 +- .../request/CardTokenizationRequest.java | 34 +-- .../request/CreateSubscriptionRequest.java | 50 ++-- .../request/CreateUserRequest.java | 16 +- .../request/DccDetailsRequest.java | 18 +- .../request/DeleteUPORequest.java | 14 +- .../com/nuvei/request/Dynamic3DRequest.java | 13 + .../request/EditUPOAPMRequest.java | 26 +- .../request/EditUPOCreditCardRequest.java | 24 +- .../request/EnableUPORequest.java | 14 +- .../GetMerchantPaymentMethodsRequest.java | 22 +- .../request/GetOrderDetailsRequest.java | 22 +- .../request/GetPaymentStatusRequest.java | 16 +- .../request/GetPayoutStatusRequest.java | 16 +- .../request/GetSessionTokenRequest.java | 24 +- .../request/GetSubscriptionPlansRequest.java | 26 +- .../request/GetSubscriptionsListRequest.java | 24 +- .../request/GetUserDetailsRequest.java | 16 +- .../request/GetUserUPOsRequest.java | 18 +- .../request/InitPaymentRequest.java | 18 +- .../request/McpRatesRequest.java | 16 +- .../request/NuveiBaseRequest.java} | 16 +- .../request/NuveiCCRequest.java} | 24 +- .../request/NuveiOrderDetailsRequest.java} | 26 +- .../request/NuveiOrderRequest.java} | 8 +- .../request/NuveiPaymentRequest.java} | 8 +- .../request/NuveiRequest.java} | 14 +- .../request/NuveiTransactionRequest.java} | 18 +- .../request/OpenOrderRequest.java | 24 +- .../request/OrderRequestWithDetails.java | 18 +- .../request/Payment3DRequest.java | 22 +- .../request/PaymentAPMRequest.java | 46 +-- .../request/PaymentCCRequest.java | 24 +- .../request/PaymentRequest.java | 12 +- .../request/PayoutRequest.java | 40 +-- .../request/RefundTransactionRequest.java | 26 +- .../request/SettleTransactionRequest.java | 28 +- .../request/SuspendUPORequest.java | 14 +- .../request/UpdateOrderRequest.java | 22 +- .../request/UpdateUserRequest.java | 16 +- .../request/Verify3dRequest.java | 35 ++- .../request/VoidTransactionRequest.java | 18 +- .../request/basic/CashierUserRequest.java | 8 +- .../request/basic/EditUPOBasicRequest.java | 35 ++- .../request/builder/NuveiBaseBuilder.java} | 60 ++-- .../builder/NuveiBaseOrderBuilder.java} | 88 +++--- .../request/builder/NuveiBuilder.java} | 72 ++--- .../request/builder/NuveiCCBuilder.java} | 34 +-- .../builder/NuveiCashierUserBuilder.java} | 12 +- .../request/builder/NuveiOrderBuilder.java} | 90 +++--- .../NuveiOrderWithDetailsBuilder.java} | 16 +- .../request/builder/NuveiPaymentBuilder.java} | 14 +- .../builder/NuveiTransactionBuilder.java} | 68 ++--- .../request/builder/PaymentBuilder.java | 10 +- .../response/AccountCaptureResponse.java | 10 +- .../response/AddUPOAPMResponse.java | 12 +- .../AddUPOCreditCardByTempTokenResponse.java | 12 +- .../AddUPOCreditCardByTokenResponse.java | 12 +- .../response/AddUPOCreditCardResponse.java | 14 +- .../response/Authorization3DResponse.java | 12 +- .../Authorize3dAndPaymentResponse.java | 14 +- .../nuvei/response/Authorize3dResponse.java | 13 + .../response/CancelSubscriptionResponse.java | 24 ++ .../response/CardDetailsResponse.java | 10 +- .../response/CardTokenizationResponse.java | 14 +- .../response/CreateSubscriptionResponse.java | 12 +- .../response/DccDetailsResponse.java | 6 +- .../com/nuvei/response/DeleteUPOResponse.java | 16 ++ .../com/nuvei/response/Dynamic3DResponse.java | 9 + .../nuvei/response/EditUPOAPMResponse.java | 16 ++ .../response/EditUPOCreditCardResponse.java | 8 +- .../com/nuvei/response/EnableUPOResponse.java | 16 ++ .../GetMerchantPaymentMethodsResponse.java | 14 +- .../response/GetOrderDetailsResponse.java | 28 +- .../response/GetPaymentStatusResponse.java | 10 +- .../response/GetPayoutStatusResponse.java | 8 +- .../response/GetSessionTokenResponse.java | 24 ++ .../GetSubscriptionPlansResponse.java | 14 +- .../GetSubscriptionsListResponse.java | 14 +- .../response/GetUserDetailsResponse.java | 8 +- .../response/GetUserUPOsResponse.java | 10 +- .../response/InitPaymentResponse.java | 10 +- .../response/McpRatesResponse.java | 12 +- .../response/NuveiOrderResponse.java} | 8 +- .../response/NuveiResponse.java} | 20 +- .../response/NuveiTransactionResponse.java} | 12 +- .../response/OpenOrderResponse.java | 12 +- .../response/Payment3DResponse.java | 10 +- .../response/PaymentAPMResponse.java | 10 +- .../response/PaymentCCResponse.java | 10 +- .../com/nuvei/response/PaymentResponse.java | 13 + .../response/PaymentsCCResponse.java | 8 +- .../response/PaymentsResponse.java | 12 +- .../response/PayoutResponse.java | 14 +- .../response/RefundTransactionResponse.java | 12 +- .../response/SettleTransactionResponse.java | 24 ++ .../nuvei/response/SuspendUPOResponse.java | 16 ++ .../response/ThreeDResponse.java | 7 +- .../response/UpdateOrderResponse.java | 12 +- .../response/UserResponse.java | 6 +- .../response/Verify3dResponse.java | 10 +- .../response/VoidTransactionResponse.java | 24 ++ .../util/APIConstants.java | 10 +- .../util/AddressUtils.java | 14 +- .../util/AtLeastOneFieldPresent.java | 2 +- .../util/AtLeastOneFieldPresentValidator.java | 2 +- .../{safecharge => nuvei}/util/CardUtils.java | 8 +- .../util/ChecksumUtils.java | 12 +- .../{safecharge => nuvei}/util/Constants.java | 6 +- .../util/DeviceUtils.java | 8 +- .../util/DynamicDescriptorUtils.java | 6 +- .../util/MerchantUtils.java | 8 +- .../util/RequestUtils.java | 8 +- .../{safecharge => nuvei}/util/UrlUtils.java | 8 +- .../util/ValidChecksum.java | 6 +- .../util/ValidationUtils.java | 12 +- .../com/safecharge/biz/ServiceFactory.java | 14 - .../SafechargeConfigurationException.java | 24 -- .../exception/SafechargeException.java | 15 - .../safecharge/request/Dynamic3DRequest.java | 13 - .../response/Authorize3dResponse.java | 13 - .../response/CancelSubscriptionResponse.java | 24 -- .../response/DeleteUPOResponse.java | 16 -- .../response/Dynamic3DResponse.java | 9 - .../response/EditUPOAPMResponse.java | 16 -- .../response/EnableUPOResponse.java | 16 -- .../response/GetSessionTokenResponse.java | 24 -- .../safecharge/response/PaymentResponse.java | 13 - .../response/SettleTransactionResponse.java | 24 -- .../response/SuspendUPOResponse.java | 16 -- .../response/VoidTransactionResponse.java | 24 -- .../biz/NuveiTest.java} | 231 ++++++++------- .../{safecharge => nuvei}/test/BaseTest.java | 99 ++++--- .../test/ValidationsTest.java | 250 ++++++++--------- .../test/workflow/APMWorkflowTest.java | 54 ++-- .../test/workflow/CompleteFunctionalTest.java | 40 +-- .../test/workflow/CreditCardWorkflowTest.java | 65 ++--- .../test/workflow/TestVariables.java | 8 +- .../workflow/paymentCC/BasePaymentCCTest.java | 28 +- .../InvalidPaymentCCRequestTest.java | 28 +- src/test/resources/log4j2.xml | 4 +- .../resources/mock/request/paymentAPM.json | 2 +- .../resources/mock/response/paymentAPM.json | 2 +- 251 files changed, 2304 insertions(+), 2330 deletions(-) create mode 100644 pom-internal.xml rename src/main/java/com/{safecharge/biz/Safecharge.java => nuvei/biz/Nuvei.java} (81%) rename src/main/java/com/{safecharge/biz/SafechargeClientBuilder.java => nuvei/biz/NuveiClientBuilder.java} (83%) rename src/main/java/com/{safecharge/biz/SafechargeHttpClient.java => nuvei/biz/NuveiHttpClient.java} (51%) rename src/main/java/com/{safecharge/biz/SafechargeRequestExecutor.java => nuvei/biz/NuveiRequestExecutor.java} (78%) rename src/main/java/com/{safecharge => nuvei}/biz/RequestBuilder.java (64%) create mode 100644 src/main/java/com/nuvei/biz/ServiceFactory.java rename src/main/java/com/{safecharge => nuvei}/biz/simple/payment/SimpleAPMPayment.java (63%) rename src/main/java/com/{safecharge => nuvei}/biz/simple/payment/SimpleCreditCardPayment.java (71%) create mode 100644 src/main/java/com/nuvei/exception/NuveiConfigurationException.java create mode 100644 src/main/java/com/nuvei/exception/NuveiException.java rename src/main/java/com/{safecharge => nuvei}/model/Account.java (98%) rename src/main/java/com/{safecharge => nuvei}/model/Acquirer.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/Addendums.java (88%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsAirlines.java (76%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsAirlinesFlightLegDetails.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsAirlinesPassengerDetails.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsAirlinesReservationDetails.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsCardPresentPointOfSale.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/AddendumsLocalPayment.java (95%) rename src/main/java/com/{safecharge => nuvei}/model/AmountDetails.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/AmountInfo.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/ApiExternalToken.java (98%) rename src/main/java/com/{safecharge => nuvei}/model/AssuranceDetails.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/BasePaymentOption.java (78%) rename src/main/java/com/{safecharge => nuvei}/model/BillingAddress.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/BrowserDetails.java (96%) rename src/main/java/com/{safecharge => nuvei}/model/Card.java (91%) rename src/main/java/com/{safecharge => nuvei}/model/CardData.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/CardResponse.java (95%) rename src/main/java/com/{safecharge => nuvei}/model/CashierPaymentMethodDetails.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/CommonUserDetailsInfo.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/CompanyDetails.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/CurrencyConversion.java (88%) rename src/main/java/com/{safecharge => nuvei}/model/DeviceDetails.java (90%) rename src/main/java/com/{safecharge => nuvei}/model/DynamicDescriptor.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/ExternalMpi.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/ExternalSchemeDetails.java (81%) rename src/main/java/com/{safecharge => nuvei}/model/ExternalToken.java (91%) rename src/main/java/com/{safecharge => nuvei}/model/ExternalTokenInfo.java (98%) rename src/main/java/com/{safecharge => nuvei}/model/ExternalTokenProvider.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/Field.java (92%) rename src/main/java/com/{safecharge => nuvei}/model/FraudDetails.java (91%) rename src/main/java/com/{safecharge => nuvei}/model/FraudDetailsSystem.java (92%) rename src/main/java/com/{safecharge => nuvei}/model/FraudRule.java (90%) rename src/main/java/com/{safecharge => nuvei}/model/InitPaymentCard.java (87%) rename src/main/java/com/{safecharge => nuvei}/model/InitPaymentPaymentOption.java (72%) rename src/main/java/com/{safecharge => nuvei}/model/InitPaymentThreeD.java (86%) rename src/main/java/com/{safecharge => nuvei}/model/Item.java (95%) rename src/main/java/com/{safecharge => nuvei}/model/LocalizationMessage.java (84%) rename src/main/java/com/{safecharge => nuvei}/model/MerchantBaseInfo.java (78%) rename src/main/java/com/{safecharge => nuvei}/model/MerchantDetails.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/MerchantInfo.java (77%) rename src/main/java/com/{safecharge => nuvei}/model/OpenAmount.java (86%) rename src/main/java/com/{safecharge => nuvei}/model/OpenOrderCard.java (83%) rename src/main/java/com/{safecharge => nuvei}/model/OpenOrderPaymentOption.java (69%) rename src/main/java/com/{safecharge => nuvei}/model/OpenOrderThreeD.java (93%) rename src/main/java/com/{safecharge => nuvei}/model/OpenOrderThreeDV2AdditionalParams.java (96%) rename src/main/java/com/{safecharge => nuvei}/model/PartialApprovalDetails.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentDetailsAlternativePaymentMethod.java (95%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentDetailsCard.java (81%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentDetailsPaymentOption.java (90%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentDetailsThreeD.java (75%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentInfo.java (90%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentMethod.java (94%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentMethodDetails.java (94%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentOption.java (92%) rename src/main/java/com/{safecharge => nuvei}/model/PaymentOptionResponse.java (90%) rename src/main/java/com/{safecharge => nuvei}/model/Proxy.java (74%) rename src/main/java/com/{safecharge => nuvei}/model/Rate.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/RateByCurrency.java (79%) rename src/main/java/com/{safecharge => nuvei}/model/RecipientDetails.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/RefundPaymentOption.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/RestApiUserDetails.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/RiskInfo.java (96%) rename src/main/java/com/{safecharge => nuvei}/model/Sdk.java (95%) rename src/main/java/com/{safecharge => nuvei}/model/SdkResponse.java (73%) rename src/main/java/com/{safecharge => nuvei}/model/ShippingTrackingDetails.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/StoredCredentials.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/SubMerchant.java (89%) rename src/main/java/com/{safecharge => nuvei}/model/SubMethod.java (85%) rename src/main/java/com/{safecharge => nuvei}/model/SubMethodDetails.java (91%) rename src/main/java/com/{safecharge => nuvei}/model/SubscriptionPlan.java (96%) rename src/main/java/com/{safecharge => nuvei}/model/SubscriptionsListElement.java (94%) rename src/main/java/com/{safecharge => nuvei}/model/ThreeD.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/TokenizationData.java (78%) rename src/main/java/com/{safecharge => nuvei}/model/UrlDetails.java (91%) rename src/main/java/com/{safecharge => nuvei}/model/UserAddress.java (96%) rename src/main/java/com/{safecharge => nuvei}/model/UserDetails.java (78%) rename src/main/java/com/{safecharge => nuvei}/model/UserDetailsCashier.java (87%) rename src/main/java/com/{safecharge => nuvei}/model/UserPaymentOption.java (84%) rename src/main/java/com/{safecharge => nuvei}/model/V2AdditionalParams.java (97%) rename src/main/java/com/{safecharge => nuvei}/model/Verify3dCard.java (74%) rename src/main/java/com/{safecharge => nuvei}/model/Verify3dPaymentOption.java (74%) rename src/main/java/com/{safecharge => nuvei}/model/Verify3dThreeD.java (89%) rename src/main/java/com/{safecharge => nuvei}/request/AccountCaptureRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/AddUPOAPMRequest.java (87%) rename src/main/java/com/{safecharge => nuvei}/request/AddUPOCreditCardByTempTokenRequest.java (88%) rename src/main/java/com/{safecharge => nuvei}/request/AddUPOCreditCardByTokenRequest.java (94%) rename src/main/java/com/{safecharge => nuvei}/request/AddUPOCreditCardRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/Authorization3DRequest.java (75%) rename src/main/java/com/{safecharge => nuvei}/request/Authorize3dAndPaymentRequest.java (96%) rename src/main/java/com/{safecharge => nuvei}/request/Authorize3dRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/CancelSubscriptionRequest.java (79%) rename src/main/java/com/{safecharge => nuvei}/request/CardDetailsRequest.java (77%) rename src/main/java/com/{safecharge => nuvei}/request/CardTokenizationRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/CreateSubscriptionRequest.java (94%) rename src/main/java/com/{safecharge => nuvei}/request/CreateUserRequest.java (51%) rename src/main/java/com/{safecharge => nuvei}/request/DccDetailsRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/DeleteUPORequest.java (60%) create mode 100644 src/main/java/com/nuvei/request/Dynamic3DRequest.java rename src/main/java/com/{safecharge => nuvei}/request/EditUPOAPMRequest.java (88%) rename src/main/java/com/{safecharge => nuvei}/request/EditUPOCreditCardRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/EnableUPORequest.java (61%) rename src/main/java/com/{safecharge => nuvei}/request/GetMerchantPaymentMethodsRequest.java (88%) rename src/main/java/com/{safecharge => nuvei}/request/GetOrderDetailsRequest.java (75%) rename src/main/java/com/{safecharge => nuvei}/request/GetPaymentStatusRequest.java (61%) rename src/main/java/com/{safecharge => nuvei}/request/GetPayoutStatusRequest.java (61%) rename src/main/java/com/{safecharge => nuvei}/request/GetSessionTokenRequest.java (60%) rename src/main/java/com/{safecharge => nuvei}/request/GetSubscriptionPlansRequest.java (53%) rename src/main/java/com/{safecharge => nuvei}/request/GetSubscriptionsListRequest.java (87%) rename src/main/java/com/{safecharge => nuvei}/request/GetUserDetailsRequest.java (67%) rename src/main/java/com/{safecharge => nuvei}/request/GetUserUPOsRequest.java (69%) rename src/main/java/com/{safecharge => nuvei}/request/InitPaymentRequest.java (94%) rename src/main/java/com/{safecharge => nuvei}/request/McpRatesRequest.java (89%) rename src/main/java/com/{safecharge/request/SafechargeBaseRequest.java => nuvei/request/NuveiBaseRequest.java} (86%) rename src/main/java/com/{safecharge/request/SafechargeCCRequest.java => nuvei/request/NuveiCCRequest.java} (86%) rename src/main/java/com/{safecharge/request/SafechargeOrderDetailsRequest.java => nuvei/request/NuveiOrderDetailsRequest.java} (92%) rename src/main/java/com/{safecharge/request/SafechargeOrderRequest.java => nuvei/request/NuveiOrderRequest.java} (71%) rename src/main/java/com/{safecharge/request/SafechargePaymentRequest.java => nuvei/request/NuveiPaymentRequest.java} (89%) rename src/main/java/com/{safecharge/request/SafechargeRequest.java => nuvei/request/NuveiRequest.java} (76%) rename src/main/java/com/{safecharge/request/SafechargeTransactionRequest.java => nuvei/request/NuveiTransactionRequest.java} (90%) rename src/main/java/com/{safecharge => nuvei}/request/OpenOrderRequest.java (92%) rename src/main/java/com/{safecharge => nuvei}/request/OrderRequestWithDetails.java (89%) rename src/main/java/com/{safecharge => nuvei}/request/Payment3DRequest.java (79%) rename src/main/java/com/{safecharge => nuvei}/request/PaymentAPMRequest.java (81%) rename src/main/java/com/{safecharge => nuvei}/request/PaymentCCRequest.java (60%) rename src/main/java/com/{safecharge => nuvei}/request/PaymentRequest.java (89%) rename src/main/java/com/{safecharge => nuvei}/request/PayoutRequest.java (91%) rename src/main/java/com/{safecharge => nuvei}/request/RefundTransactionRequest.java (84%) rename src/main/java/com/{safecharge => nuvei}/request/SettleTransactionRequest.java (88%) rename src/main/java/com/{safecharge => nuvei}/request/SuspendUPORequest.java (60%) rename src/main/java/com/{safecharge => nuvei}/request/UpdateOrderRequest.java (67%) rename src/main/java/com/{safecharge => nuvei}/request/UpdateUserRequest.java (53%) rename src/main/java/com/{safecharge => nuvei}/request/Verify3dRequest.java (86%) rename src/main/java/com/{safecharge => nuvei}/request/VoidTransactionRequest.java (83%) rename src/main/java/com/{safecharge => nuvei}/request/basic/CashierUserRequest.java (92%) rename src/main/java/com/{safecharge => nuvei}/request/basic/EditUPOBasicRequest.java (78%) rename src/main/java/com/{safecharge/request/builder/SafechargeBaseBuilder.java => nuvei/request/builder/NuveiBaseBuilder.java} (56%) rename src/main/java/com/{safecharge/request/builder/SafechargeBaseOrderBuilder.java => nuvei/request/builder/NuveiBaseOrderBuilder.java} (87%) rename src/main/java/com/{safecharge/request/builder/SafechargeBuilder.java => nuvei/request/builder/NuveiBuilder.java} (53%) rename src/main/java/com/{safecharge/request/builder/SafechargeCCBuilder.java => nuvei/request/builder/NuveiCCBuilder.java} (86%) rename src/main/java/com/{safecharge/request/builder/SafechargeCashierUserBuilder.java => nuvei/request/builder/NuveiCashierUserBuilder.java} (88%) rename src/main/java/com/{safecharge/request/builder/SafechargeOrderBuilder.java => nuvei/request/builder/NuveiOrderBuilder.java} (87%) rename src/main/java/com/{safecharge/request/builder/SafechargeOrderWithDetailsBuilder.java => nuvei/request/builder/NuveiOrderWithDetailsBuilder.java} (78%) rename src/main/java/com/{safecharge/request/builder/SafechargePaymentBuilder.java => nuvei/request/builder/NuveiPaymentBuilder.java} (80%) rename src/main/java/com/{safecharge/request/builder/SafechargeTransactionBuilder.java => nuvei/request/builder/NuveiTransactionBuilder.java} (71%) rename src/main/java/com/{safecharge => nuvei}/request/builder/PaymentBuilder.java (81%) rename src/main/java/com/{safecharge => nuvei}/response/AccountCaptureResponse.java (69%) rename src/main/java/com/{safecharge => nuvei}/response/AddUPOAPMResponse.java (66%) rename src/main/java/com/{safecharge => nuvei}/response/AddUPOCreditCardByTempTokenResponse.java (64%) rename src/main/java/com/{safecharge => nuvei}/response/AddUPOCreditCardByTokenResponse.java (64%) rename src/main/java/com/{safecharge => nuvei}/response/AddUPOCreditCardResponse.java (89%) rename src/main/java/com/{safecharge => nuvei}/response/Authorization3DResponse.java (79%) rename src/main/java/com/{safecharge => nuvei}/response/Authorize3dAndPaymentResponse.java (95%) create mode 100644 src/main/java/com/nuvei/response/Authorize3dResponse.java create mode 100644 src/main/java/com/nuvei/response/CancelSubscriptionResponse.java rename src/main/java/com/{safecharge => nuvei}/response/CardDetailsResponse.java (84%) rename src/main/java/com/{safecharge => nuvei}/response/CardTokenizationResponse.java (85%) rename src/main/java/com/{safecharge => nuvei}/response/CreateSubscriptionResponse.java (61%) rename src/main/java/com/{safecharge => nuvei}/response/DccDetailsResponse.java (90%) create mode 100644 src/main/java/com/nuvei/response/DeleteUPOResponse.java create mode 100644 src/main/java/com/nuvei/response/Dynamic3DResponse.java create mode 100644 src/main/java/com/nuvei/response/EditUPOAPMResponse.java rename src/main/java/com/{safecharge => nuvei}/response/EditUPOCreditCardResponse.java (59%) create mode 100644 src/main/java/com/nuvei/response/EnableUPOResponse.java rename src/main/java/com/{safecharge => nuvei}/response/GetMerchantPaymentMethodsResponse.java (74%) rename src/main/java/com/{safecharge => nuvei}/response/GetOrderDetailsResponse.java (89%) rename src/main/java/com/{safecharge => nuvei}/response/GetPaymentStatusResponse.java (93%) rename src/main/java/com/{safecharge => nuvei}/response/GetPayoutStatusResponse.java (94%) create mode 100644 src/main/java/com/nuvei/response/GetSessionTokenResponse.java rename src/main/java/com/{safecharge => nuvei}/response/GetSubscriptionPlansResponse.java (63%) rename src/main/java/com/{safecharge => nuvei}/response/GetSubscriptionsListResponse.java (70%) rename src/main/java/com/{safecharge => nuvei}/response/GetUserDetailsResponse.java (53%) rename src/main/java/com/{safecharge => nuvei}/response/GetUserUPOsResponse.java (68%) rename src/main/java/com/{safecharge => nuvei}/response/InitPaymentResponse.java (94%) rename src/main/java/com/{safecharge => nuvei}/response/McpRatesResponse.java (61%) rename src/main/java/com/{safecharge/response/SafechargeOrderResponse.java => nuvei/response/NuveiOrderResponse.java} (61%) rename src/main/java/com/{safecharge/response/SafechargeResponse.java => nuvei/response/NuveiResponse.java} (91%) rename src/main/java/com/{safecharge/response/SafechargeTransactionResponse.java => nuvei/response/NuveiTransactionResponse.java} (98%) rename src/main/java/com/{safecharge => nuvei}/response/OpenOrderResponse.java (77%) rename src/main/java/com/{safecharge => nuvei}/response/Payment3DResponse.java (80%) rename src/main/java/com/{safecharge => nuvei}/response/PaymentAPMResponse.java (74%) rename src/main/java/com/{safecharge => nuvei}/response/PaymentCCResponse.java (50%) create mode 100644 src/main/java/com/nuvei/response/PaymentResponse.java rename src/main/java/com/{safecharge => nuvei}/response/PaymentsCCResponse.java (94%) rename src/main/java/com/{safecharge => nuvei}/response/PaymentsResponse.java (94%) rename src/main/java/com/{safecharge => nuvei}/response/PayoutResponse.java (92%) rename src/main/java/com/{safecharge => nuvei}/response/RefundTransactionResponse.java (59%) create mode 100644 src/main/java/com/nuvei/response/SettleTransactionResponse.java create mode 100644 src/main/java/com/nuvei/response/SuspendUPOResponse.java rename src/main/java/com/{safecharge => nuvei}/response/ThreeDResponse.java (97%) rename src/main/java/com/{safecharge => nuvei}/response/UpdateOrderResponse.java (72%) rename src/main/java/com/{safecharge => nuvei}/response/UserResponse.java (52%) rename src/main/java/com/{safecharge => nuvei}/response/Verify3dResponse.java (91%) create mode 100644 src/main/java/com/nuvei/response/VoidTransactionResponse.java rename src/main/java/com/{safecharge => nuvei}/util/APIConstants.java (94%) rename src/main/java/com/{safecharge => nuvei}/util/AddressUtils.java (96%) rename src/main/java/com/{safecharge => nuvei}/util/AtLeastOneFieldPresent.java (95%) rename src/main/java/com/{safecharge => nuvei}/util/AtLeastOneFieldPresentValidator.java (98%) rename src/main/java/com/{safecharge => nuvei}/util/CardUtils.java (87%) rename src/main/java/com/{safecharge => nuvei}/util/ChecksumUtils.java (96%) rename src/main/java/com/{safecharge => nuvei}/util/Constants.java (98%) rename src/main/java/com/{safecharge => nuvei}/util/DeviceUtils.java (74%) rename src/main/java/com/{safecharge => nuvei}/util/DynamicDescriptorUtils.java (74%) rename src/main/java/com/{safecharge => nuvei}/util/MerchantUtils.java (89%) rename src/main/java/com/{safecharge => nuvei}/util/RequestUtils.java (86%) rename src/main/java/com/{safecharge => nuvei}/util/UrlUtils.java (72%) rename src/main/java/com/{safecharge => nuvei}/util/ValidChecksum.java (76%) rename src/main/java/com/{safecharge => nuvei}/util/ValidationUtils.java (83%) delete mode 100644 src/main/java/com/safecharge/biz/ServiceFactory.java delete mode 100644 src/main/java/com/safecharge/exception/SafechargeConfigurationException.java delete mode 100644 src/main/java/com/safecharge/exception/SafechargeException.java delete mode 100644 src/main/java/com/safecharge/request/Dynamic3DRequest.java delete mode 100644 src/main/java/com/safecharge/response/Authorize3dResponse.java delete mode 100644 src/main/java/com/safecharge/response/CancelSubscriptionResponse.java delete mode 100644 src/main/java/com/safecharge/response/DeleteUPOResponse.java delete mode 100644 src/main/java/com/safecharge/response/Dynamic3DResponse.java delete mode 100644 src/main/java/com/safecharge/response/EditUPOAPMResponse.java delete mode 100644 src/main/java/com/safecharge/response/EnableUPOResponse.java delete mode 100644 src/main/java/com/safecharge/response/GetSessionTokenResponse.java delete mode 100644 src/main/java/com/safecharge/response/PaymentResponse.java delete mode 100644 src/main/java/com/safecharge/response/SettleTransactionResponse.java delete mode 100644 src/main/java/com/safecharge/response/SuspendUPOResponse.java delete mode 100644 src/main/java/com/safecharge/response/VoidTransactionResponse.java rename src/test/java/com/{safecharge/biz/SafechargeTest.java => nuvei/biz/NuveiTest.java} (75%) rename src/test/java/com/{safecharge => nuvei}/test/BaseTest.java (56%) rename src/test/java/com/{safecharge => nuvei}/test/ValidationsTest.java (86%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/APMWorkflowTest.java (76%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/CompleteFunctionalTest.java (92%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/CreditCardWorkflowTest.java (74%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/TestVariables.java (96%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/paymentCC/BasePaymentCCTest.java (63%) rename src/test/java/com/{safecharge => nuvei}/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java (80%) diff --git a/LICENSE b/LICENSE index 8feb78b..a8bf1d6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Safecharge Bulgaria ltd +Copyright (c) 2017 Nuvei Bulgaria ltd Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b47309e..39893db 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# SafeCharge REST API SDK for Java. +# Nuvei REST API SDK for Java. -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.safecharge/safecharge-sdk-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.safecharge/safecharge-sdk-java) -[![codecov](https://codecov.io/gh/SafeChargeInternational/safecharge-java/branch/development/graph/badge.svg)](https://codecov.io/gh/SafeChargeInternational/safecharge-java) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.nuvei/nuvei-sdk-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.nuvei/nuvei-sdk-java) +[![codecov](https://codecov.io/gh/NuveiInternational/nuvei-java/branch/development/graph/badge.svg)](https://codecov.io/gh/NuveiInternational/nuvei-java) + +Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. For Nuvei REST API documentation, please see: https://docs.nuvei.com/api/main -SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. For SafeCharge REST API documentation, please see: https://www.safecharge.com/docs/api/ - ## Requirements Java 1.7 or later. @@ -15,13 +15,13 @@ If your application is going to be deployed on a Java EE server add the followin ```xml - com.safecharge - safecharge-sdk-java - 1.7.10 + com.nuvei + nuvei-sdk-java + 2.0.0 ``` -If you are going to use the SDK in Java SE or a non Java EE server please add a Bean Validation API Implementation dependency. Certified implementations of Bean Validation API can be found here: http://beanvalidation.org/certified/ (v.1.1 implementation required). +If you are going to use the SDK in Java SE or a non Java EE server please add a Bean Validation API Implementation dependency. Certified implementations of Bean Validation API can be found here: http://beanvalidation.org/certified/ (v.1.1 implementation required). For example: @@ -29,9 +29,9 @@ For example: ... - com.safecharge - safecharge-sdk-java - 1.7.10 + com.nuvei + nuvei-sdk-java + 2.0.0 org.apache.bval @@ -43,34 +43,34 @@ For example: ## Running your first request -You only need to setup a HTTP Client and to provide the SafeCharge API host to the request executor and then you can start building requests and send them to the SafeCharge API. +You only need to setup a HTTP Client and to provide the Nuvei API host to the request executor and then you can start building requests and send them to the Nuvei API. Check how simple it is trough this sample: ```java -import com.safecharge.biz.SafechargeRequestExecutor; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.SafechargeRequest; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.util.APIConstants; -import com.safecharge.util.Constants; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.NuveiRequest; +import com.nuvei.response.NuveiResponse; +import com.nuvei.util.APIConstants; +import com.nuvei.util.Constants; public class Sample { public static void main(String[] args) { - SafechargeRequestExecutor requestExecutor = SafechargeRequestExecutor.getInstance(); + NuveiRequestExecutor requestExecutor = NuveiRequestExecutor.getInstance(); - MerchantInfo merchantInfo = new MerchantInfo("MERCHANT_KEY_PROVIDED_BY_SAFECHARGE", "MERCHANT_ID_PROVIDED_BY_SAFECHARGE", - "MERCHANT_SITE_ID_PROVIDED_BY_SAFECHARGE", APIConstants.INTEGRATION_HOST, Constants.HashAlgorithm.SHA256); + MerchantInfo merchantInfo = new MerchantInfo("MERCHANT_KEY_PROVIDED_BY_NUVEI", "MERCHANT_ID_PROVIDED_BY_NUVEI", + "MERCHANT_SITE_ID_PROVIDED_BY_NUVEI", APIConstants.INTEGRATION_HOST, Constants.HashAlgorithm.SHA256); - SafechargeBaseRequest safechargeRequest = GetSessionTokenRequest.builder() + NuveiRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - SafechargeResponse response = requestExecutor.executeRequest(safechargeRequest); + NuveiResponse response = requestExecutor.executeRequest(nuveiRequest); System.out.println("Received sessionToken = " + response.getSessionToken()); } } ``` -More samples tests can be found [here](https://github.com/SafeChargeInternational/safecharge-java/tree/master/src/test/java/com/safecharge/test/workflow/). +More samples tests can be found [here](https://github.com/Nuvei/nuvei-server-java/tree/master/src/test/java/com/nuvei/test/workflow/). diff --git a/pom-github.xml b/pom-github.xml index f711556..b6a722e 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.safecharge - safecharge-sdk-java - 1.7.9 + com.nuvei + nuvei-sdk-java + 2.0.0 - Safecharge SDK for Java - SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s + Nuvei SDK for Java + Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, + easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. - https://github.com/SafeChargeInternational/safecharge-java + https://github.com/Nuvei/nuvei-server-java - SafeCharge - https://www.safecharge.com + Nuvei + https://www.nuvei.com diff --git a/pom-internal.xml b/pom-internal.xml new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index 29acaf0..b0f5a61 100644 --- a/pom.xml +++ b/pom.xml @@ -4,25 +4,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.safecharge - safecharge-sdk-java - 1.7.10 + com.nuvei + nuvei-sdk-java + 2.0.0 https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt - Safecharge SDK for Java - SafeCharge’s REST API SDK for Java provides developer tools for accessing Safecharge's REST API. SafeCharge’s REST API is a simple, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s + Nuvei SDK for Java + Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, + easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. - https://github.com/SafeChargeInternational/safecharge-java + https://github.com/NuveiInternational/nuvei-java - SafeCharge - https://www.safecharge.com + Nuvei + https://www.nuvei.com @@ -33,9 +33,9 @@ - scm:git:git://github.com/SafeChargeInternational/safecharge-java.git - scm:git:ssh://github.com:SafeChargeInternational/safecharge-java.git - http://github.com/SafeChargeInternational/safecharge-java/tree/master + scm:git:git://github.com/Nuvei/nuvei-server-java.git + scm:git:ssh://github.com:Nuvei/nuvei-server-java.git + http://github.com/Nuvei/nuvei-server-java/tree/master diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/nuvei/biz/Nuvei.java similarity index 81% rename from src/main/java/com/safecharge/biz/Safecharge.java rename to src/main/java/com/nuvei/biz/Nuvei.java index 1e5ff33..4fb738e 100644 --- a/src/main/java/com/safecharge/biz/Safecharge.java +++ b/src/main/java/com/nuvei/biz/Nuvei.java @@ -1,38 +1,38 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import java.util.List; import java.util.Map; -import com.safecharge.exception.SafechargeConfigurationException; -import com.safecharge.exception.SafechargeException; -import com.safecharge.model.*; -import com.safecharge.request.*; -import com.safecharge.response.*; -import com.safecharge.util.Constants; +import com.nuvei.exception.NuveiConfigurationException; +import com.nuvei.exception.NuveiException; +import com.nuvei.model.*; +import com.nuvei.request.*; +import com.nuvei.response.*; +import com.nuvei.util.Constants; /** *

- * This class is a wrapper for the most used endpoints in Safecharge's REST API. It makes it easier to execute openOrder, + * This class is a wrapper for the most used endpoints in Nuvei's REST API. It makes it easier to execute openOrder, * initPayment and createPayment requests. First you have to invoke initialize method and then choose the corresponding request * method. *

* - * @author Vassil Nikov + * @author Vassil Nikov */ -public class Safecharge { +public class Nuvei { private final ServiceFactory serviceFactory; - private SafechargeRequestExecutor requestExecutor; + private NuveiRequestExecutor requestExecutor; private MerchantInfo merchantInfo; private String sessionToken; - public Safecharge() { + public Nuvei() { this.serviceFactory = new ServiceFactory(); - this.requestExecutor = SafechargeRequestExecutor.getInstance(); + this.requestExecutor = NuveiRequestExecutor.getInstance(); } /** @@ -41,15 +41,15 @@ public Safecharge() { * object and getting the mandatory sessionToken. *

* - * @param merchantId The id corresponding to the merchant's GwId in Safecharge's system - * @param siteId The Merchant site id in Safecharge's system - * @param merchantKey The merchant key in Safecharge's system + * @param merchantId The id corresponding to the merchant's GwId in Nuvei's system + * @param siteId The Merchant site id in Nuvei's system + * @param merchantKey The merchant key in Nuvei's system * @param serverHost Points to the environment's URL to which to make the corresponding request. Currently can be either integration or production * @param algorithm Hashing algorithm. Can be MD5 or SHA-256 - * @throws SafechargeConfigurationException if getting a session token isn't successful. - * @throws SafechargeException if there are request related problems. + * @throws NuveiConfigurationException if getting a session token isn't successful. + * @throws NuveiException if there are request related problems. */ - public void initialize(String merchantId, String siteId, String merchantKey, String serverHost, Constants.HashAlgorithm algorithm) throws SafechargeException { + public void initialize(String merchantId, String siteId, String merchantKey, String serverHost, Constants.HashAlgorithm algorithm) throws NuveiException { merchantInfo = createMerchantInfo(merchantId, siteId, merchantKey, serverHost, algorithm); sessionToken = getSessionToken(); } @@ -58,12 +58,12 @@ private MerchantInfo createMerchantInfo(String merchantId, String siteId, String return new MerchantInfo(merchantKey, merchantId, siteId, serverHost, algorithm); } - private String getSessionToken() throws SafechargeException { + private String getSessionToken() throws NuveiException { RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getSessionTokenRequest(merchantInfo); - SafechargeResponse response = requestExecutor.execute(request); + NuveiBaseRequest request = requestBuilder.getSessionTokenRequest(merchantInfo); + NuveiResponse response = requestExecutor.execute(request); if (Constants.APIResponseStatus.ERROR.equals(response.getStatus())) { - throw new SafechargeConfigurationException(response.getReason()); + throw new NuveiConfigurationException(response.getReason()); } return response.getSessionToken(); @@ -71,7 +71,7 @@ private String getSessionToken() throws SafechargeException { /** *

- * This method should be used to create request for payment endpoint in Safecharge's REST API. The payment method is your endpoint for performing payment of any kind. + * This method should be used to create request for payment endpoint in Nuvei's REST API. The payment method is your endpoint for performing payment of any kind. *

* * @param userTokenId This field uniquely identifies your consumer/user in your system. @@ -100,7 +100,7 @@ private String getSessionToken() throws SafechargeException { * @param productId A free text field used to identify the product/service sold. If this parameter is not * sent or is sent with an empty value, then it contains the concatenation of all item names up until the parameter maximum length. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param relatedTransactionId Mandatory in some flows like 3DSecure v2. * @param transactionType The type of transaction: Sale or Auth. @@ -109,7 +109,7 @@ private String getSessionToken() throws SafechargeException { * @param subMerchant Contains information about the SubMerchant. * @param rebillingType When performing recurring/rebilling, use this field to indicate the recurring type * @param authenticationOnlyType This field is intended for merchants using the Zero Authorisation feature. - * @param userId Unique identifier of the user in SafeCharge. + * @param userId Unique identifier of the user in Nuvei. * @param externalSchemeDetails This block should be used if a merchant is changing from another Acquirer. * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. * @param isPartialApproval This describes a situation where the deposit was completed and processed with an amount lower than the requested amount due to a consumer’s lack of funds within the desired payment method. @@ -121,10 +121,10 @@ private String getSessionToken() throws SafechargeException { * @param shippingTrackingDetails Holds information about shippingTrackingDetails. * @param cvvNotUsed Flag if CVV is not used * @param serviceDueDate Subscription end date - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public PaymentResponse payment(String userTokenId, String clientUniqueId, String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, @@ -133,12 +133,12 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, - String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed, String serviceDueDate) throws SafechargeException { + String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, + ShippingTrackingDetails shippingTrackingDetails, String cvvNotUsed, String serviceDueDate) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getPaymentRequest(merchantInfo, sessionToken, userTokenId, clientUniqueId, clientRequestId, paymentOption, + NuveiBaseRequest request = requestBuilder.getPaymentRequest(merchantInfo, sessionToken, userTokenId, clientUniqueId, clientRequestId, paymentOption, isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, @@ -149,13 +149,13 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String private void ensureMerchantInfoAndSessionTokenNotNull() { if (merchantInfo == null || sessionToken == null) { - throw new SafechargeConfigurationException("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); + throw new NuveiConfigurationException("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); } } /** *

- * This method should be used to create request for initPayment endpoint in Safecharge's REST API. This method initiates the payment process for transactions. + * This method should be used to create request for initPayment endpoint in Nuvei's REST API. This method initiates the payment process for transactions. *

* * @param userTokenId This field uniquely identifies your consumer/user in your system. @@ -171,22 +171,22 @@ private void ensureMerchantInfoAndSessionTokenNotNull() { * DMN to the provided address per request. * @param customData General data about the customer provided by the merchant. * @param billingAddress The billing address. - * @param userId Unique identifier of the user in SafeCharge. + * @param userId Unique identifier of the user in Nuvei. * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". * @param recipientDetails This class is relevant for Visa’s AFTs, and contains the details of the recipient receiving the funding. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId, String clientRequestId, String currency, String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, String customData, UserAddress billingAddress, String userId, String aftOverride, - RecipientDetails recipientDetails) throws SafechargeException { + RecipientDetails recipientDetails) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getInitPaymentRequest(sessionToken, userTokenId, clientUniqueId, clientRequestId, currency, + NuveiBaseRequest request = requestBuilder.getInitPaymentRequest(sessionToken, userTokenId, clientUniqueId, clientRequestId, currency, amount, deviceDetails, paymentOption, urlDetails, customData, billingAddress, merchantInfo, userId, aftOverride, recipientDetails); @@ -195,7 +195,7 @@ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId /** *

- * This method should be used to create request for openOrder endpoint in Safecharge's REST API. + * This method should be used to create request for openOrder endpoint in Nuvei's REST API. *

* * @param userTokenId This field uniquely identifies your consumer/user in your system. @@ -224,7 +224,7 @@ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId * @param amountDetails The amount details. * @param addendums This block contains industry specific addendums. The addendum fields that appear are based on the specific addendum type. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param autoPayment3D Autopayment3D flag. * @param isMoto When performing recurring/rebilling, use this field to indicate the recurring step @@ -233,17 +233,17 @@ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId * @param isRebilling When performing recurring/rebilling, use this field to indicate the recurring step. * @param rebillingType When performing recurring/rebilling, use this field to indicate the recurring type * @param preventOverride Enables the merchant to override /openOrder with Web SDK fields like shippingAddress or billingAddress. - * @param userId Unique identifier of the user in SafeCharge. + * @param userId Unique identifier of the user in Nuvei. * @param isPartialApproval Used in cases where the deposit was completed and processed with an amount lower than the requested amount * due to a consumer’s lack of funds within the desired payment method. * @param externalSchemeDetails Used to provide original transactionId for the initial payment as originated in external system and card brand. * @param currencyConversion Used to specify currency conversion details * @param openAmount Defines minimum and maximum allowed amount for the order * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, String clientUniqueId, String customSiteName, String productId, OpenOrderPaymentOption paymentOption, Constants.TransactionType transactionType, String currency, String amount, @@ -253,11 +253,11 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getOpenOrderRequest(merchantInfo, sessionToken, clientRequestId, customSiteName, productId, + NuveiBaseRequest request = requestBuilder.getOpenOrderRequest(merchantInfo, sessionToken, clientRequestId, customSiteName, productId, paymentOption, transactionType, currency, amount, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, urlDetails, userTokenId, clientUniqueId, userPaymentOption, paymentMethod, amountDetails, addendums, customData, autoPayment3D, isMoto, authenticationOnlyType, subMerchant, isRebilling, rebillingType, @@ -268,27 +268,27 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S /** *

- * This method should be used to create request for getPaymentStatus endpoint in Safecharge's REST API. This method retrieves + * This method should be used to create request for getPaymentStatus endpoint in Nuvei's REST API. This method retrieves * the status of a payment recently performed. It receives the session ID and queries if a payment was performed. *

* - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ - public GetPaymentStatusResponse getPaymentStatus() throws SafechargeException { + public GetPaymentStatusResponse getPaymentStatus() throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getPaymentStatusRequest(sessionToken, merchantInfo); + NuveiBaseRequest request = requestBuilder.getPaymentStatusRequest(sessionToken, merchantInfo); return (GetPaymentStatusResponse) requestExecutor.execute(request); } /** *

- * This method should be used to create request for voidTransaction endpoint in Safecharge's REST API. + * This method should be used to create request for voidTransaction endpoint in Nuvei's REST API. *

* * @param clientRequestId ID of the API request in merchant system. This value must be unique. @@ -305,22 +305,22 @@ public GetPaymentStatusResponse getPaymentStatus() throws SafechargeException { * @param productId A free text field used to identify the product/service sold. If this parameter is not * sent or is sent with an empty value, then it contains the concatenation of all item names up until the parameter maximum length. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param comment Enables the addition of a free text comment to the request. * @param subMerchant Contains information about the SubMerchant. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public VoidTransactionResponse voidTransaction(String clientRequestId, String relatedTransactionId, String amount, String currency, String authCode, String clientUniqueId, UrlDetails urlDetails, String customSiteName, - String productId, String customData, String comment, SubMerchant subMerchant) throws SafechargeException { + String productId, String customData, String comment, SubMerchant subMerchant) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getVoidTransactionRequest(sessionToken, clientRequestId, merchantInfo, relatedTransactionId, + NuveiBaseRequest request = requestBuilder.getVoidTransactionRequest(sessionToken, clientRequestId, merchantInfo, relatedTransactionId, amount, currency, authCode, clientUniqueId, urlDetails, customSiteName, productId, customData, comment, subMerchant); return (VoidTransactionResponse) requestExecutor.execute(request); @@ -328,7 +328,7 @@ public VoidTransactionResponse voidTransaction(String clientRequestId, String re /** *

- * This method should be used to create request for settleTransaction endpoint in Safecharge's REST API. The settleTransaction + * This method should be used to create request for settleTransaction endpoint in Nuvei's REST API. The settleTransaction * method is used for settling an authorisation transaction that was previously performed, with a two-phase Auth-Settle process, for either a full or partial settlements *

* @@ -344,7 +344,7 @@ public VoidTransactionResponse voidTransaction(String clientRequestId, String re * @param amount The transaction amount. * @param authCode The authorisation code of the original transaction to be refunded. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param comment Enables the addition of a free text comment to the request. * @param currency The three-letter ISO currency code. @@ -353,20 +353,20 @@ public VoidTransactionResponse voidTransaction(String clientRequestId, String re * sent or is sent with an empty value, then it contains the concatenation of all item names up until the parameter maximum length. * @param relatedTransactionId The ID of the original transaction to be settled. * @param subMerchant Contains information about the SubMerchant. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public SettleTransactionResponse settleTransaction(String clientUniqueId, String clientRequestId, Addendums addendums, String descriptorMerchantName, String descriptorMerchantPhone, UrlDetails urlDetails, String amount, String authCode, String customData, String comment, String currency, String customSiteName, String productId, - String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) throws SafechargeException { + String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getSettleTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, addendums, + NuveiBaseRequest request = requestBuilder.getSettleTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, addendums, descriptorMerchantName, descriptorMerchantPhone, urlDetails, amount, authCode, customData, comment, currency, customSiteName, productId, relatedTransactionId, subMerchant, shippingTrackingDetails); @@ -375,7 +375,7 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String /** *

- * This method should be used to create request for refundTransaction endpoint in Safecharge's REST API. + * This method should be used to create request for refundTransaction endpoint in Nuvei's REST API. *

* * @param clientUniqueId The ID of the transaction in the merchant’s system. This value must be unique. @@ -389,7 +389,7 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String * @param comment Enables the addition of a free text comment to the request. * @param currency The three-letter ISO currency code. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param customSiteName The merchant’s site name. This is useful for merchants operating many websites that are distinguished only by name. * @param productId A free text field used to identify the product/service sold. @@ -397,21 +397,19 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String * of all item names up until parameter maximum length. * @param relatedTransactionId The ID of the settle transaction. * @param subMerchant Contains information about the SubMerchant. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ - public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, - UrlDetails urlDetails, + public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) throws SafechargeException { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, - clientUniqueId, + NuveiBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, relatedTransactionId, subMerchant, companyDetails, refundPaymentOption, userTokenId); @@ -420,7 +418,7 @@ public RefundTransactionResponse refundTransaction(String clientUniqueId, String /** *

- * Call this method if you need to use the SafeCharge MPI service to perform a 3D Secure only request. This method is called after the /authorize3d method in case of the Challenge. + * Call this method if you need to use the Nuvei MPI service to perform a 3D Secure only request. This method is called after the /authorize3d method in case of the Challenge. *

* * @param clientUniqueId This ID identifies the transaction in your system. Optionally, you can pass this value to us @@ -431,29 +429,29 @@ public RefundTransactionResponse refundTransaction(String clientUniqueId, String * @param billingAddress The billing address related to a user payment option. Since an order can contain only * one payment option, the billing address is part of the order parameters. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s back-office + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s back-office * tool transaction reporting and is returned in response. * @param customSiteName The merchant’s site name. This is useful for merchants operating many websites that are distinguished only by name. * @param merchantDetails Optional custom fields. * @param relatedTransactionId The transaction ID of the of the call to . * @param subMerchant Contains information about the SubMerchant. - * @param userId Unique identifier of the user in SafeCharge. + * @param userId Unique identifier of the user in Nuvei. * @param userTokenId This field uniquely identifies your consumer/user in your system. * Required if you wish to use the paymentOptionId field for future charging of this user without re-collecting the payment details * @param paymentOption This class represents the details about the payment method. * Can have either card, alternativePaymentMethod, or userPaymentOptionId. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public Verify3dResponse verify3d(String clientUniqueId, String clientRequestId, String amount, String currency, UserAddress billingAddress, String customData, String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, - SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) throws SafechargeException { + SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getVerify3dRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, amount, + NuveiBaseRequest request = requestBuilder.getVerify3dRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, amount, currency, billingAddress, customData, customSiteName, merchantDetails, relatedTransactionId, subMerchant, userId, userTokenId, paymentOption); @@ -462,7 +460,7 @@ public Verify3dResponse verify3d(String clientUniqueId, String clientRequestId, /** *

- * Call this method if you need to use the SafeCharge MPI service to perform a 3D Secure only request. This method is + * Call this method if you need to use the Nuvei MPI service to perform a 3D Secure only request. This method is * called after the /initPayment method and returns the information regarding whether the merchant has to perform a * Challenge or if they receive a frictionless response. *

@@ -496,21 +494,21 @@ public Verify3dResponse verify3d(String clientUniqueId, String clientRequestId, * @param productId A free text field used to identify the product/service sold. If this parameter is not * sent or is sent with an empty value, then it contains the concatenation of all item names up until the parameter maximum length. * @param customData This parameter can be used to pass any type of information. - * If sent in request, then is passed on to the payments gateway, is visible in SafeCharge’s + * If sent in request, then is passed on to the payments gateway, is visible in Nuvei’s * back-office tool transaction reporting and is returned in response. * @param relatedTransactionId Sets the transactionId returned from the preceding initPayment call. * @param transactionType The type of transaction * @param autoPayment3D Autopayment3D flag. * @param subMerchant Contains information about the SubMerchant. - * @param userId Unique identifier of the user in SafeCharge. + * @param userId Unique identifier of the user in Nuvei. * @param isPartialApproval Used in cases where the deposit was completed and processed with an amount lower than the requested amount * due to a consumer’s lack of funds within the desired payment method. * @param externalSchemeDetails Used to provide original transactionId for the initial payment as originated in external system and card brand. * @param currencyConversion Used to specify currency conversion details - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId, String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, String amount, AmountDetails amountDetails, @@ -520,11 +518,11 @@ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId String customSiteName, String productId, String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - String isPartialApproval) throws SafechargeException { + String isPartialApproval) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getAuthorize3dRequest(merchantInfo, sessionToken, userTokenId, clientUniqueId, + NuveiBaseRequest request = requestBuilder.getAuthorize3dRequest(merchantInfo, sessionToken, userTokenId, clientUniqueId, clientRequestId, paymentOption, isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, subMerchant, userId, externalSchemeDetails, @@ -543,12 +541,12 @@ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId * and we will store it with the transaction record created in our system for your future reference. * @param clientRequestId The ID of the API request in the merchant’s system. This value must be unique. * @param cardNumber This field can accept both cardNumber and card BIN number. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. - * @throws SafechargeException if there are request related problems. + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} + * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * @throws NuveiException if there are request related problems. */ - public CardDetailsResponse getCardDetails(String clientUniqueId, String clientRequestId, String cardNumber) throws SafechargeException { + public CardDetailsResponse getCardDetails(String clientUniqueId, String clientRequestId, String cardNumber) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -573,11 +571,11 @@ public CardDetailsResponse getCardDetails(String clientUniqueId, String clientRe * If both currency and country are provided in the input, the currency takes precedence. * @param country The 2-letter ISO country code of the conversion country (REQUIRED if currency is not populated). * If both currency and country are provided in the input, the currency takes precedence. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ public DccDetailsResponse getDccDetails(String clientUniqueId, String clientRequestId, String cardNumber, String apm, String originalAmount, - String originalCurrency, String currency, String country) throws SafechargeException { + String originalCurrency, String currency, String country) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -598,10 +596,10 @@ public DccDetailsResponse getDccDetails(String clientUniqueId, String clientRequ * @param fromCurrency The original merchant currency. * @param toCurrency The list of target currencies separated by commas. If not supplied, all the Merchant Site related currencies are retrieved. * @param paymentMethods The list of payment methods separated by commas. If not supplied, all the Merchant related payment methods are retrieved. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ - public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestId, String fromCurrency, List toCurrency, List paymentMethods) throws SafechargeException { + public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestId, String fromCurrency, List toCurrency, List paymentMethods) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -628,11 +626,11 @@ public McpRatesResponse getMcpRates(String clientUniqueId, String clientRequestI * @param userDetails Holder for user details. * @param urlDetails Although DMN responses can be configured per merchant site, it allows dynamically returning the * DMN to the provided address per request. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ public AccountCaptureResponse accountCapture(String clientRequestId, String userTokenId, String paymentMethod, String currencyCode, - String country, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) throws SafechargeException { + String country, String languageCode, String amount, String notificationUrl, DeviceDetails deviceDetails, UserDetails userDetails, UrlDetails urlDetails) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -662,15 +660,15 @@ public AccountCaptureResponse accountCapture(String clientRequestId, String user * @param cardData An alternative to sending the userPaymentOptionId for card payouts. * @param deviceDetails Information about client device * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ public PayoutResponse payout(String userTokenId, String clientUniqueId, String clientRequestId, String amount, String currency, UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, CurrencyConversion currencyConversion) - throws SafechargeException { + throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); @@ -692,14 +690,14 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c * @param paymentMethodName Specifies the payment method name of the payment option. * @param apmData APM data. * @param billingAddress Billing address. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ - public AddUPOAPMResponse addUpoApm(String userTokenId, String paymentMethodName, Map apmData, UserDetailsCashier billingAddress) throws SafechargeException { + public AddUPOAPMResponse addUpoApm(String userTokenId, String paymentMethodName, Map apmData, UserDetailsCashier billingAddress) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getAddUpoApmRequest(sessionToken, merchantInfo, + NuveiBaseRequest request = requestBuilder.getAddUpoApmRequest(sessionToken, merchantInfo, userTokenId, paymentMethodName, billingAddress, apmData); return (AddUPOAPMResponse) requestExecutor.execute(request); @@ -708,14 +706,14 @@ public AddUPOAPMResponse addUpoApm(String userTokenId, String paymentMethodName, /** * Gets the status of payout transaction by clientRequestId * @param clientRequestId The ID of the API request in the merchant’s system. This value must be unique. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ - public GetPayoutStatusResponse getPayoutStatus(String clientRequestId) throws SafechargeException { + public GetPayoutStatusResponse getPayoutStatus(String clientRequestId) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getPayoutStatusRequest(sessionToken, merchantInfo, clientRequestId); + NuveiBaseRequest request = requestBuilder.getPayoutStatusRequest(sessionToken, merchantInfo, clientRequestId); return (GetPayoutStatusResponse) requestExecutor.execute(request); } @@ -729,14 +727,14 @@ public GetPayoutStatusResponse getPayoutStatus(String clientRequestId) throws Sa * @param countryCode The country the transaction is to be completed in. * @param languageCode The language the transaction is to be completed in. * @param type Will determain which type of payment methods will be returned. Possible values: DEPOSIT, WITHDRAWAL. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @return Passes through the response from Nuvei's REST API. + * @throws NuveiException */ - public GetMerchantPaymentMethodsResponse getMerchantPaymentMethods(String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) throws SafechargeException { + public GetMerchantPaymentMethodsResponse getMerchantPaymentMethods(String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getGetMerchantPaymentMethodsRequest(sessionToken, merchantInfo, + NuveiBaseRequest request = requestBuilder.getGetMerchantPaymentMethodsRequest(sessionToken, merchantInfo, clientRequestId, currencyCode, countryCode, languageCode, type); return (GetMerchantPaymentMethodsResponse) requestExecutor.execute(request); diff --git a/src/main/java/com/safecharge/biz/SafechargeClientBuilder.java b/src/main/java/com/nuvei/biz/NuveiClientBuilder.java similarity index 83% rename from src/main/java/com/safecharge/biz/SafechargeClientBuilder.java rename to src/main/java/com/nuvei/biz/NuveiClientBuilder.java index 8f5f4d5..e9608fa 100644 --- a/src/main/java/com/safecharge/biz/SafechargeClientBuilder.java +++ b/src/main/java/com/nuvei/biz/NuveiClientBuilder.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import java.util.ArrayList; import java.util.Arrays; @@ -24,16 +24,16 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContexts; -import com.safecharge.model.Proxy; +import com.nuvei.model.Proxy; /** *

- * Builder for a {@link HttpClient} for communicating with the Safecharge's servers + * Builder for a {@link HttpClient} for communicating with the Nuvei's servers *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/16/2017 */ -public class SafechargeClientBuilder { +public class NuveiClientBuilder { public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 100; public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 10; @@ -55,7 +55,7 @@ public class SafechargeClientBuilder { * @param proxy A {@link Proxy} object to get the connection info from * @return this object */ - public SafechargeClientBuilder setProxy(Proxy proxy) { + public NuveiClientBuilder setProxy(Proxy proxy) { if (proxy != null) { HttpHost proxyHost = new HttpHost(proxy.getHost(), proxy.getPort(), proxy.getProtocol()); @@ -73,7 +73,7 @@ public SafechargeClientBuilder setProxy(Proxy proxy) { * @param requestConfig A {@link RequestConfig} object to get the connection properties from * @return this object */ - public SafechargeClientBuilder setRequestConfig(RequestConfig requestConfig) { + public NuveiClientBuilder setRequestConfig(RequestConfig requestConfig) { this.requestConfig = requestConfig; return this; } @@ -85,7 +85,7 @@ public SafechargeClientBuilder setRequestConfig(RequestConfig requestConfig) { * @param connectionManager A {@link HttpClientConnectionManager} object to get the connection properties from * @return this object */ - public SafechargeClientBuilder setConnectionManager(HttpClientConnectionManager connectionManager) { + public NuveiClientBuilder setConnectionManager(HttpClientConnectionManager connectionManager) { this.connectionManager = connectionManager; return this; } @@ -98,7 +98,7 @@ public SafechargeClientBuilder setConnectionManager(HttpClientConnectionManager * @param timeToLiveTimeUnit A {@link TimeUnit} object * @return this object */ - public SafechargeClientBuilder setConnectionTTL(int timeToLive, TimeUnit timeToLiveTimeUnit) { + public NuveiClientBuilder setConnectionTTL(int timeToLive, TimeUnit timeToLiveTimeUnit) { this.timeToLive = timeToLive; this.timeToLiveTimeUnit = timeToLiveTimeUnit; return this; @@ -111,7 +111,7 @@ public SafechargeClientBuilder setConnectionTTL(int timeToLive, TimeUnit timeToL * @param sslSocketFactory A {@link LayeredConnectionSocketFactory} object to get the connection properties from * @return this object */ - public SafechargeClientBuilder setSSLSocketFactory(LayeredConnectionSocketFactory sslSocketFactory) { + public NuveiClientBuilder setSSLSocketFactory(LayeredConnectionSocketFactory sslSocketFactory) { this.sslSocketFactory = sslSocketFactory; return this; } @@ -121,11 +121,11 @@ public SafechargeClientBuilder setSSLSocketFactory(LayeredConnectionSocketFactor /* Default methods */ /** - * Sets a Safecharge's default {@link RequestConfig} object to set connection properties like TTL, timeout, etc. + * Sets a Nuvei's default {@link RequestConfig} object to set connection properties like TTL, timeout, etc. * * @return this object */ - public SafechargeClientBuilder setDefaultRequestConfig() { + public NuveiClientBuilder setDefaultRequestConfig() { this.requestConfig = RequestConfig.custom() .setSocketTimeout(DEFAULT_TIMEOUT_MILLISECONDS) .setConnectTimeout(DEFAULT_TIMEOUT_MILLISECONDS) @@ -137,12 +137,12 @@ public SafechargeClientBuilder setDefaultRequestConfig() { } /** - * Sets a Safecharge's default {@link HttpClientConnectionManager} object to set connection properties like + * Sets a Nuvei's default {@link HttpClientConnectionManager} object to set connection properties like * number of the connections, max number of connections, number of connections per route, etc. * * @return this object */ - public SafechargeClientBuilder setDefaultConnectionManager() { + public NuveiClientBuilder setDefaultConnectionManager() { this.connectionManager = new PoolingHttpClientConnectionManager(CONNECTION_TIME_TO_LIVE_SECONDS, TimeUnit.SECONDS); ((PoolingHttpClientConnectionManager) this.connectionManager).setMaxTotal(DEFAULT_MAX_TOTAL_CONNECTIONS); ((PoolingHttpClientConnectionManager) this.connectionManager).setDefaultMaxPerRoute(DEFAULT_MAX_CONNECTIONS_PER_ROUTE); @@ -154,19 +154,19 @@ public SafechargeClientBuilder setDefaultConnectionManager() { * * @return this object */ - public SafechargeClientBuilder setDefaultConnectionTTL() { + public NuveiClientBuilder setDefaultConnectionTTL() { this.timeToLive = CONNECTION_TIME_TO_LIVE_SECONDS; this.timeToLiveTimeUnit = TimeUnit.SECONDS; return this; } /** - * Sets a Safecharge's default {@link LayeredConnectionSocketFactory} object to set connection properties, + * Sets a Nuvei's default {@link LayeredConnectionSocketFactory} object to set connection properties, * such as supported SSL Protocols, hostname verifier, etc(needed to create a https connection). * * @return this object */ - public SafechargeClientBuilder setDefaultSSLSocketFactory() { + public NuveiClientBuilder setDefaultSSLSocketFactory() { SSLContext sslContext = SSLContexts.createDefault(); String[] javaSupportedProtocols = sslContext.getSupportedSSLParameters() .getProtocols(); diff --git a/src/main/java/com/safecharge/biz/SafechargeHttpClient.java b/src/main/java/com/nuvei/biz/NuveiHttpClient.java similarity index 51% rename from src/main/java/com/safecharge/biz/SafechargeHttpClient.java rename to src/main/java/com/nuvei/biz/NuveiHttpClient.java index 20cc87f..cca4b36 100644 --- a/src/main/java/com/safecharge/biz/SafechargeHttpClient.java +++ b/src/main/java/com/nuvei/biz/NuveiHttpClient.java @@ -1,29 +1,29 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import org.apache.http.client.HttpClient; -import com.safecharge.model.Proxy; +import com.nuvei.model.Proxy; /** *

- * Wrapper class for {@link HttpClient} with specific Safecharge's properties + * Wrapper class for {@link HttpClient} with specific Nuvei's properties * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/16/2017 */ -public class SafechargeHttpClient { +public class NuveiHttpClient { /** * Creates a pre-configured {@link HttpClient} instance. * - * @return @link HttpClient} with specific Safecharge's default properties + * @return @link HttpClient} with specific Nuvei's default properties */ public static HttpClient createDefault() { - return new SafechargeClientBuilder().setDefaultConnectionManager() + return new NuveiClientBuilder().setDefaultConnectionManager() .setDefaultConnectionTTL() .setDefaultRequestConfig() .setDefaultSSLSocketFactory() @@ -31,13 +31,13 @@ public static HttpClient createDefault() { } /** - * Creates a pre-configured {@link HttpClient} instance which connects to SafeCharge's API via {@link Proxy}. + * Creates a pre-configured {@link HttpClient} instance which connects to Nuvei's API via {@link Proxy}. * * @param proxy A {@link Proxy} object to get the connection info from - * @return {@link HttpClient} with specific Safecharge's default properties and the proxy properties defined by the {@code proxy} + * @return {@link HttpClient} with specific Nuvei's default properties and the proxy properties defined by the {@code proxy} */ public static HttpClient createDefault(Proxy proxy) { - return new SafechargeClientBuilder().setProxy(proxy) + return new NuveiClientBuilder().setProxy(proxy) .setDefaultConnectionManager() .setDefaultConnectionTTL() .setDefaultRequestConfig() @@ -48,10 +48,10 @@ public static HttpClient createDefault(Proxy proxy) { /** * Provides custom {@link HttpClient} configuration. * - * @return {@link SafechargeClientBuilder} instance + * @return {@link NuveiClientBuilder} instance */ - public static SafechargeClientBuilder custom() { - return new SafechargeClientBuilder(); + public static NuveiClientBuilder custom() { + return new NuveiClientBuilder(); } } diff --git a/src/main/java/com/safecharge/biz/SafechargeRequestExecutor.java b/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java similarity index 78% rename from src/main/java/com/safecharge/biz/SafechargeRequestExecutor.java rename to src/main/java/com/nuvei/biz/NuveiRequestExecutor.java index 20014c5..c2af2ec 100644 --- a/src/main/java/com/safecharge/biz/SafechargeRequestExecutor.java +++ b/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import java.io.IOException; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import com.safecharge.exception.SafechargeException; -import com.safecharge.request.*; -import com.safecharge.response.*; +import com.nuvei.exception.NuveiException; +import com.nuvei.request.*; +import com.nuvei.response.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.Header; @@ -23,20 +23,20 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

- * This class provides functionality to execute {@link SafechargeRequest}s directly to the SafeCharge's REST API + * This class provides functionality to execute {@link NuveiRequest}s directly to the Nuvei's REST API *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/16/2017 */ -public class SafechargeRequestExecutor { +public class NuveiRequestExecutor { - private static final Log logger = LogFactory.getLog(SafechargeRequestExecutor.class); - private static final Map, Class> RESPONSE_TYPE_BY_REQUEST_TYPE = - new HashMap, Class>() { + private static final Log logger = LogFactory.getLog(NuveiRequestExecutor.class); + private static final Map, Class> RESPONSE_TYPE_BY_REQUEST_TYPE = + new HashMap, Class>() { private static final long serialVersionUID = -5429154998138428048L; { @@ -84,8 +84,8 @@ public class SafechargeRequestExecutor { put(GetPayoutStatusRequest.class, GetPayoutStatusResponse.class); } }; - private static final Map, String> REQUEST_URL_BY_REQUEST_TYPE = - new HashMap, String>() { + private static final Map, String> REQUEST_URL_BY_REQUEST_TYPE = + new HashMap, String>() { private static final long serialVersionUID = -6533247180543051173L; { @@ -135,34 +135,34 @@ public class SafechargeRequestExecutor { }; private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); - private static SafechargeRequestExecutor instance = null; + private static NuveiRequestExecutor instance = null; private static HttpClient httpClient; private static boolean isInitialized = false; - private SafechargeRequestExecutor() { + private NuveiRequestExecutor() { } /** - * Obtains the single instance of {@link SafechargeRequestExecutor} + * Obtains the single instance of {@link NuveiRequestExecutor} * - * @return the single instance of {@link SafechargeRequestExecutor} + * @return the single instance of {@link NuveiRequestExecutor} */ - public static SafechargeRequestExecutor getInstance() { + public static NuveiRequestExecutor getInstance() { if (instance == null) { - instance = new SafechargeRequestExecutor(); + instance = new NuveiRequestExecutor(); } return instance; } /** - * This method initiates the {@link SafechargeRequestExecutor} with a default Safecharge's {@link HttpClient} and server information. + * This method initiates the {@link NuveiRequestExecutor} with a default Nuvei's {@link HttpClient} and server information. */ public void init() { - init(SafechargeHttpClient.createDefault()); + init(NuveiHttpClient.createDefault()); } /** - * This method initiates the {@link SafechargeRequestExecutor} with a configured {@link HttpClient} and server information. + * This method initiates the {@link NuveiRequestExecutor} with a configured {@link HttpClient} and server information. * * @param httpClient to get the client's properties from */ @@ -171,38 +171,38 @@ public void init(HttpClient httpClient) { if (isInitialized) { // already initialized if (logger.isDebugEnabled()) { - logger.debug(SafechargeRequestExecutor.class.getSimpleName() + " is already initialized!"); + logger.debug(NuveiRequestExecutor.class.getSimpleName() + " is already initialized!"); } return; } - SafechargeRequestExecutor.httpClient = httpClient; + NuveiRequestExecutor.httpClient = httpClient; isInitialized = true; } /** - * Sends a {@link SafechargeRequest} to SafeCharge's API via HTTP POST method. + * Sends a {@link NuveiRequest} to Nuvei's API via HTTP POST method. * - * @param request {@link SafechargeRequest} API request object - * @return {@link SafechargeResponse} API response object or null if the response can't be parsed + * @param request {@link NuveiRequest} API request object + * @return {@link NuveiResponse} API response object or null if the response can't be parsed */ - public SafechargeResponse executeRequest(SafechargeBaseRequest request) { + public NuveiResponse executeRequest(NuveiBaseRequest request) { try { return execute(request); - } catch (SafechargeException e) { + } catch (NuveiException e) { return null; } } /** - * Sends a {@link SafechargeRequest} to SafeCharge's API via HTTP POST method. + * Sends a {@link NuveiRequest} to Nuvei's API via HTTP POST method. * - * @param request {@link SafechargeRequest} API request object - * @return {@link SafechargeResponse} API response object. - * @throws SafechargeException If the request execution throws IOException it is wrapped and rethrown in {@link SafechargeException} + * @param request {@link NuveiRequest} API request object + * @return {@link NuveiResponse} API response object. + * @throws NuveiException If the request execution throws IOException it is wrapped and rethrown in {@link NuveiException} */ - public SafechargeResponse execute(SafechargeBaseRequest request) throws SafechargeException { + public NuveiResponse execute(NuveiBaseRequest request) throws NuveiException { if (!isInitialized) { init(); } @@ -211,14 +211,14 @@ public SafechargeResponse execute(SafechargeBaseRequest request) throws Safechar Gson gson = gsonBuilder.create(); try { - Class requestClass = request.getClass(); + Class requestClass = request.getClass(); String serviceUrl = request.getServerHost() + REQUEST_URL_BY_REQUEST_TYPE.get(requestClass); request.setServerHost(null); // remove API url from request String requestJSON = gson.toJson(request); String responseJSON = executeJsonRequest(requestJSON, serviceUrl, requestClass); - SafechargeResponse response = gson.fromJson(responseJSON, RESPONSE_TYPE_BY_REQUEST_TYPE.get(requestClass)); + NuveiResponse response = gson.fromJson(responseJSON, RESPONSE_TYPE_BY_REQUEST_TYPE.get(requestClass)); response.setJson(responseJSON); return response; @@ -227,7 +227,7 @@ public SafechargeResponse execute(SafechargeBaseRequest request) throws Safechar if (logger.isDebugEnabled()) { logger.debug(e.getMessage()); } - throw new SafechargeException(e.getMessage()); + throw new NuveiException(e.getMessage()); } } @@ -239,7 +239,7 @@ public SafechargeResponse execute(SafechargeBaseRequest request) throws Safechar * @return {@link String} response from the service (representing JSON object) * @throws IOException if the connection is interrupted or the response is unparsable */ - public String executeJsonRequest(String requestJSON, String serviceUrl, Class requestClass) throws IOException { + public String executeJsonRequest(String requestJSON, String serviceUrl, Class requestClass) throws IOException { return executeRequest(requestJSON, serviceUrl, APIConstants.REQUEST_HEADERS, requestClass); } @@ -254,7 +254,7 @@ public String executeJsonRequest(String requestJSON, String serviceUrl, Class requestClass) throws IOException { + public String executeRequest(String request, String serviceUrl, Header[] headers, Class requestClass) throws IOException { HttpPost httpPost = new HttpPost(serviceUrl); httpPost.setHeaders(headers); httpPost.setEntity(new StringEntity(request, Charset.forName("UTF-8"))); @@ -267,7 +267,7 @@ public String executeRequest(String request, String serviceUrl, Header[] headers String responseJSON = EntityUtils.toString(response.getEntity(), UTF8_CHARSET); if (logger.isDebugEnabled()) { - Class responseClass = RESPONSE_TYPE_BY_REQUEST_TYPE.get(requestClass); + Class responseClass = RESPONSE_TYPE_BY_REQUEST_TYPE.get(requestClass); logger.debug(responseClass.getSimpleName() + " Received " + responseJSON); } diff --git a/src/main/java/com/safecharge/biz/RequestBuilder.java b/src/main/java/com/nuvei/biz/RequestBuilder.java similarity index 64% rename from src/main/java/com/safecharge/biz/RequestBuilder.java rename to src/main/java/com/nuvei/biz/RequestBuilder.java index e8505b3..d653a65 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/nuvei/biz/RequestBuilder.java @@ -1,36 +1,36 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import java.util.List; import java.util.Map; -import com.safecharge.model.*; -import com.safecharge.request.*; -import com.safecharge.util.Constants; +import com.nuvei.model.*; +import com.nuvei.request.*; +import com.nuvei.util.Constants; public class RequestBuilder { - public SafechargeBaseRequest getSessionTokenRequest(MerchantInfo merchantInfo) { + public NuveiBaseRequest getSessionTokenRequest(MerchantInfo merchantInfo) { return GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); } - public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, - String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, - String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, - RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, - DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, - UrlDetails urlDetails, String customSiteName, String productId, String customData, - String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, - String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, - String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, - RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed, String serviceDueDate) { + public NuveiBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, + String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, + String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, + RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, + DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, + UrlDetails urlDetails, String customSiteName, String productId, String customData, + String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, + String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, + String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, + String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, + RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String cvvNotUsed, String serviceDueDate) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -76,10 +76,10 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .build(); } - public SafechargeBaseRequest getInitPaymentRequest(String sessionToken, String userTokenId, String clientUniqueId, String clientRequestId, String currency, - String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, - String customData, UserAddress billingAddress, MerchantInfo merchantInfo, String userId, String aftOverride, - RecipientDetails recipientDetails) { + public NuveiBaseRequest getInitPaymentRequest(String sessionToken, String userTokenId, String clientUniqueId, String clientRequestId, String currency, + String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, + String customData, UserAddress billingAddress, MerchantInfo merchantInfo, String userId, String aftOverride, + RecipientDetails recipientDetails) { return InitPaymentRequest.builder() .addSessionToken(sessionToken) .addUserTokenId(userTokenId) @@ -99,15 +99,15 @@ public SafechargeBaseRequest getInitPaymentRequest(String sessionToken, String u .build(); } - public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, String sessionToken, String clientRequestId, String customSiteName, - String productId, OpenOrderPaymentOption paymentOption, Constants.TransactionType transactionType, - String currency, String amount, List items, DeviceDetails deviceDetails, RestApiUserDetails userDetails, - UserAddress shippingAddress, UserAddress billingAddress, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, - UrlDetails urlDetails, String userTokenId, String clientUniqueId, UserPaymentOption userPaymentOption, - String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, - String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, - String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { + public NuveiBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, String sessionToken, String clientRequestId, String customSiteName, + String productId, OpenOrderPaymentOption paymentOption, Constants.TransactionType transactionType, + String currency, String amount, List items, DeviceDetails deviceDetails, RestApiUserDetails userDetails, + UserAddress shippingAddress, UserAddress billingAddress, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, + UrlDetails urlDetails, String userTokenId, String clientUniqueId, UserPaymentOption userPaymentOption, + String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, + String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, + String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { return OpenOrderRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -151,14 +151,14 @@ public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, Stri .build(); } - public SafechargeBaseRequest getPaymentStatusRequest(String sessionToken, MerchantInfo merchantInfo) { + public NuveiBaseRequest getPaymentStatusRequest(String sessionToken, MerchantInfo merchantInfo) { return GetPaymentStatusRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) .build(); } - public SafechargeBaseRequest getPayoutStatusRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId) { + public NuveiBaseRequest getPayoutStatusRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId) { return GetPayoutStatusRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -166,10 +166,10 @@ public SafechargeBaseRequest getPayoutStatusRequest(String sessionToken, Merchan .build(); } - public SafechargeBaseRequest getVoidTransactionRequest(String sessionToken, String clientRequestId, MerchantInfo merchantInfo, - String relatedTransactionId, String amount, String currency, String authCode, - String clientUniqueId, UrlDetails urlDetails, String customSiteName, - String productId, String customData, String comment, SubMerchant subMerchant) { + public NuveiBaseRequest getVoidTransactionRequest(String sessionToken, String clientRequestId, MerchantInfo merchantInfo, + String relatedTransactionId, String amount, String currency, String authCode, + String clientUniqueId, UrlDetails urlDetails, String customSiteName, + String productId, String customData, String comment, SubMerchant subMerchant) { return VoidTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -188,12 +188,12 @@ public SafechargeBaseRequest getVoidTransactionRequest(String sessionToken, Stri .build(); } - public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, - String clientRequestId, Addendums addendums, String descriptorMerchantName, - String descriptorMerchantPhone, - UrlDetails urlDetails, String amount, String authCode, String customData, - String comment, String currency, String customSiteName, String productId, - String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) { + public NuveiBaseRequest getSettleTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, + String clientRequestId, Addendums addendums, String descriptorMerchantName, + String descriptorMerchantPhone, + UrlDetails urlDetails, String amount, String authCode, String customData, + String comment, String currency, String customSiteName, String productId, + String relatedTransactionId, SubMerchant subMerchant, ShippingTrackingDetails shippingTrackingDetails) { return SettleTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addClientUniqueId(clientUniqueId) @@ -216,11 +216,11 @@ public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, Me .build(); } - public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, - String clientRequestId, UrlDetails urlDetails, String amount, String authCode, - String comment, String currency, String customData, String customSiteName, - String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { + public NuveiBaseRequest getRefundTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, + String clientRequestId, UrlDetails urlDetails, String amount, String authCode, + String comment, String currency, String customData, String customSiteName, + String productId, String relatedTransactionId, SubMerchant subMerchant, + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -242,10 +242,10 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me .build(); } - public SafechargeBaseRequest getVerify3dRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, String clientRequestId, - String amount, String currency, UserAddress billingAddress, String customData, - String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, - SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) { + public NuveiBaseRequest getVerify3dRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, String clientRequestId, + String amount, String currency, UserAddress billingAddress, String customData, + String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, + SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) { return Verify3dRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -265,15 +265,15 @@ public SafechargeBaseRequest getVerify3dRequest(String sessionToken, MerchantInf .build(); } - public SafechargeBaseRequest getAuthorize3dRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, - String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, - String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, - RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, - DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, - UrlDetails urlDetails, String customSiteName, String productId, String customData, - String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, - SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, - CurrencyConversion currencyConversion, String isPartialApproval) { + public NuveiBaseRequest getAuthorize3dRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, + String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, + String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, + RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, + DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, + UrlDetails urlDetails, String customSiteName, String productId, String customData, + String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, + SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, + CurrencyConversion currencyConversion, String isPartialApproval) { return Authorize3dRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -395,7 +395,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .build(); } - public SafechargeBaseRequest getAddUpoApmRequest(String sessionToken, MerchantInfo merchantInfo, String userTokenId, String paymentMethodName, UserDetailsCashier billingAddress, Map apmData) { + public NuveiBaseRequest getAddUpoApmRequest(String sessionToken, MerchantInfo merchantInfo, String userTokenId, String paymentMethodName, UserDetailsCashier billingAddress, Map apmData) { return AddUPOAPMRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -406,7 +406,7 @@ public SafechargeBaseRequest getAddUpoApmRequest(String sessionToken, MerchantIn .build(); } - public SafechargeBaseRequest getGetMerchantPaymentMethodsRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) { + public NuveiBaseRequest getGetMerchantPaymentMethodsRequest(String sessionToken, MerchantInfo merchantInfo, String clientRequestId, String currencyCode, String countryCode, String languageCode, String type) { return GetMerchantPaymentMethodsRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) diff --git a/src/main/java/com/nuvei/biz/ServiceFactory.java b/src/main/java/com/nuvei/biz/ServiceFactory.java new file mode 100644 index 0000000..46057a0 --- /dev/null +++ b/src/main/java/com/nuvei/biz/ServiceFactory.java @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.biz; + +public class ServiceFactory { + + public RequestBuilder getRequestBuilder() { + return new RequestBuilder(); + } +} diff --git a/src/main/java/com/safecharge/biz/simple/payment/SimpleAPMPayment.java b/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java similarity index 63% rename from src/main/java/com/safecharge/biz/simple/payment/SimpleAPMPayment.java rename to src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java index 3be8f25..a4b1856 100644 --- a/src/main/java/com/safecharge/biz/simple/payment/SimpleAPMPayment.java +++ b/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java @@ -1,38 +1,38 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz.simple.payment; +package com.nuvei.biz.simple.payment; import java.util.Map; -import com.safecharge.biz.SafechargeRequestExecutor; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.PaymentAPMRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.response.PaymentsResponse; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.util.Constants; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.PaymentAPMRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.response.PaymentsResponse; +import com.nuvei.response.NuveiResponse; +import com.nuvei.util.Constants; /** *

- * An example class demonstrating the use of the Safecharge's API to process a payment using + * An example class demonstrating the use of the Nuvei's API to process a payment using * Alternative Payment Method(E.g. PayPal, Netteler, Skrill, ...). * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/27/2017 */ public class SimpleAPMPayment { private MerchantInfo merchantInfo; - private SafechargeRequestExecutor requestExecutor = SafechargeRequestExecutor.getInstance(); + private NuveiRequestExecutor requestExecutor = NuveiRequestExecutor.getInstance(); /** * Even if this constructor allows the {@code merchantInfo} to be null, the payment request will fail due to missing parameters * - * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Safecharge + * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Nuvei */ public SimpleAPMPayment(MerchantInfo merchantInfo) { this.merchantInfo = merchantInfo; @@ -41,8 +41,8 @@ public SimpleAPMPayment(MerchantInfo merchantInfo) { /** * Executes an APM payment. * - * @param paymentMethod The Safecharge's name of the payment method to use for the payment. For a list of possible - * values check APM Unique SafeCharge Names + * @param paymentMethod The Nuvei's name of the payment method to use for the payment. For a list of possible + * values check APM Unique Nuvei Names * @param userAccountDetails Account details specific for the concrete payment method(E.g. user, pass, tokenId, ...) * @param amount The transaction amount * @param currency The three character ISO currency code @@ -50,12 +50,12 @@ public SimpleAPMPayment(MerchantInfo merchantInfo) { * @return PaymentsResponse object(containing the transaction result) or null if the obtaining of a session is unsuccessful */ public PaymentsResponse executePayment(String paymentMethod, Map userAccountDetails, String amount, String currency, String countryCode) { - SafechargeResponse getSessionTokenResponse = requestExecutor.executeRequest(GetSessionTokenRequest.builder() + NuveiResponse getSessionTokenResponse = requestExecutor.executeRequest(GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build()); if (getSessionTokenResponse != null && Constants.APIResponseStatus.SUCCESS.equals(getSessionTokenResponse.getStatus())) { - SafechargeBaseRequest paymentAPMRequest = PaymentAPMRequest.builder() + NuveiBaseRequest paymentAPMRequest = PaymentAPMRequest.builder() .addSessionToken(getSessionTokenResponse.getSessionToken()) .addMerchantInfo(merchantInfo) .addCurrency(currency) diff --git a/src/main/java/com/safecharge/biz/simple/payment/SimpleCreditCardPayment.java b/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java similarity index 71% rename from src/main/java/com/safecharge/biz/simple/payment/SimpleCreditCardPayment.java rename to src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java index bfb6934..a5c1bc5 100644 --- a/src/main/java/com/safecharge/biz/simple/payment/SimpleCreditCardPayment.java +++ b/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java @@ -1,37 +1,37 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz.simple.payment; +package com.nuvei.biz.simple.payment; -import com.safecharge.biz.SafechargeRequestExecutor; -import com.safecharge.model.CardData; -import com.safecharge.model.ExternalMpi; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.PaymentCCRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.response.PaymentsResponse; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.util.Constants; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.model.CardData; +import com.nuvei.model.ExternalMpi; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.PaymentCCRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.response.PaymentsResponse; +import com.nuvei.response.NuveiResponse; +import com.nuvei.util.Constants; /** *

- * An example class demonstrating the use of the Safecharge's API to process a payment using credit card. + * An example class demonstrating the use of the Nuvei's API to process a payment using credit card. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/27/2017 */ public class SimpleCreditCardPayment { private MerchantInfo merchantInfo; - private SafechargeRequestExecutor requestExecutor = SafechargeRequestExecutor.getInstance(); + private NuveiRequestExecutor requestExecutor = NuveiRequestExecutor.getInstance(); /** * Even if this constructor allows the {@code merchantInfo} to be null, the payment request will fail due to missing parameters * - * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Safecharge + * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Nuvei */ public SimpleCreditCardPayment(MerchantInfo merchantInfo) { this.merchantInfo = merchantInfo; @@ -40,7 +40,7 @@ public SimpleCreditCardPayment(MerchantInfo merchantInfo) { /** * Executes Auth transaction to check the availability of a required amount of funds. * No funds are collected during an authorization. For more info check the - * Safecharge API glossary. + * Nuvei API glossary. * * @param cardData An object representing credit card * @param amount The amount which availability should be checked @@ -54,7 +54,7 @@ public PaymentsResponse executeAuthPayment(CardData cardData, String amount, Str /** * Executes both Auth and Sale transaction to check the availability of a required amount of funds and settle the transaction. * For more info check the - * Safecharge API glossary. + * Nuvei API glossary. * * @param cardData An object representing credit card * @param amount The amount which availability should be checked @@ -67,12 +67,12 @@ public PaymentsResponse executeSalePayment(CardData cardData, String amount, Str private PaymentsResponse executePayment(CardData cardData, String amount, String currency, Constants.TransactionType transactionType, String isPartialApproval, ExternalMpi externalMpi) { - SafechargeResponse getSessionTokenResponse = requestExecutor + NuveiResponse getSessionTokenResponse = requestExecutor .executeRequest(GetSessionTokenRequest.builder().addMerchantInfo(merchantInfo).build()); if (getSessionTokenResponse != null && Constants.APIResponseStatus.SUCCESS.equals(getSessionTokenResponse.getStatus())) { - SafechargeBaseRequest paymentCCRequest = PaymentCCRequest.builder() + NuveiBaseRequest paymentCCRequest = PaymentCCRequest.builder() .addSessionToken(getSessionTokenResponse.getSessionToken()) .addMerchantInfo(merchantInfo) .addCurrency(currency) diff --git a/src/main/java/com/nuvei/exception/NuveiConfigurationException.java b/src/main/java/com/nuvei/exception/NuveiConfigurationException.java new file mode 100644 index 0000000..67b18fe --- /dev/null +++ b/src/main/java/com/nuvei/exception/NuveiConfigurationException.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.exception; + +/** + *

+ * Wrapper class for exceptions due to configuration issues. + * + * @author Nikola Dichev + * @since 3/8/2017 + */ +public class NuveiConfigurationException extends RuntimeException { + + public NuveiConfigurationException() { + super(); + } + + public NuveiConfigurationException(String message) { + super(message); + } + +} \ No newline at end of file diff --git a/src/main/java/com/nuvei/exception/NuveiException.java b/src/main/java/com/nuvei/exception/NuveiException.java new file mode 100644 index 0000000..14f1d51 --- /dev/null +++ b/src/main/java/com/nuvei/exception/NuveiException.java @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.exception; + +public class NuveiException extends Exception { + + public NuveiException() { + } + + public NuveiException(String message) { + super(message); + } +} diff --git a/src/main/java/com/safecharge/model/Account.java b/src/main/java/com/nuvei/model/Account.java similarity index 98% rename from src/main/java/com/safecharge/model/Account.java rename to src/main/java/com/nuvei/model/Account.java index ba60cc6..81f3b54 100644 --- a/src/main/java/com/safecharge/model/Account.java +++ b/src/main/java/com/nuvei/model/Account.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Acquirer.java b/src/main/java/com/nuvei/model/Acquirer.java similarity index 89% rename from src/main/java/com/safecharge/model/Acquirer.java rename to src/main/java/com/nuvei/model/Acquirer.java index 98e9386..922aa8d 100644 --- a/src/main/java/com/safecharge/model/Acquirer.java +++ b/src/main/java/com/nuvei/model/Acquirer.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Addendums.java b/src/main/java/com/nuvei/model/Addendums.java similarity index 88% rename from src/main/java/com/safecharge/model/Addendums.java rename to src/main/java/com/nuvei/model/Addendums.java index d37f8e7..7c96a45 100644 --- a/src/main/java/com/safecharge/model/Addendums.java +++ b/src/main/java/com/nuvei/model/Addendums.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; @@ -11,7 +11,7 @@ * Container for additional domain specific payment info such as Airplane tickets data, * country's law specific payment data, etc. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class Addendums { diff --git a/src/main/java/com/safecharge/model/AddendumsAirlines.java b/src/main/java/com/nuvei/model/AddendumsAirlines.java similarity index 76% rename from src/main/java/com/safecharge/model/AddendumsAirlines.java rename to src/main/java/com/nuvei/model/AddendumsAirlines.java index 3969d40..bebb538 100644 --- a/src/main/java/com/safecharge/model/AddendumsAirlines.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlines.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; @@ -10,7 +10,7 @@ *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see Addendums * @since 8/8/2018 */ diff --git a/src/main/java/com/safecharge/model/AddendumsAirlinesFlightLegDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java similarity index 97% rename from src/main/java/com/safecharge/model/AddendumsAirlinesFlightLegDetails.java rename to src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java index 96aa651..0243aee 100644 --- a/src/main/java/com/safecharge/model/AddendumsAirlinesFlightLegDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see Addendums * @since 8/8/2018 */ diff --git a/src/main/java/com/safecharge/model/AddendumsAirlinesPassengerDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java similarity index 93% rename from src/main/java/com/safecharge/model/AddendumsAirlinesPassengerDetails.java rename to src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java index 2a9c5fc..b07eebe 100644 --- a/src/main/java/com/safecharge/model/AddendumsAirlinesPassengerDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see Addendums * @since 8/8/2018 */ diff --git a/src/main/java/com/safecharge/model/AddendumsAirlinesReservationDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java similarity index 97% rename from src/main/java/com/safecharge/model/AddendumsAirlinesReservationDetails.java rename to src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java index f1e8d9e..2aa90bb 100644 --- a/src/main/java/com/safecharge/model/AddendumsAirlinesReservationDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.List; @@ -12,7 +12,7 @@ *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see Addendums * @since 8/8/2018 */ diff --git a/src/main/java/com/safecharge/model/AddendumsCardPresentPointOfSale.java b/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java similarity index 97% rename from src/main/java/com/safecharge/model/AddendumsCardPresentPointOfSale.java rename to src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java index cdd22d0..dd8f1c6 100644 --- a/src/main/java/com/safecharge/model/AddendumsCardPresentPointOfSale.java +++ b/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see Addendums * @since 8/8/2018 */ diff --git a/src/main/java/com/safecharge/model/AddendumsLocalPayment.java b/src/main/java/com/nuvei/model/AddendumsLocalPayment.java similarity index 95% rename from src/main/java/com/safecharge/model/AddendumsLocalPayment.java rename to src/main/java/com/nuvei/model/AddendumsLocalPayment.java index db6caf1..89ad70a 100644 --- a/src/main/java/com/safecharge/model/AddendumsLocalPayment.java +++ b/src/main/java/com/nuvei/model/AddendumsLocalPayment.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; @@ -10,7 +10,7 @@ *

* Local payment info specific for some clients. Part of {@link Addendums}. * - * @author Nikola Dichev + * @author Nikola Dichev * @see Addendums * @since 3/29/2017 */ diff --git a/src/main/java/com/safecharge/model/AmountDetails.java b/src/main/java/com/nuvei/model/AmountDetails.java similarity index 93% rename from src/main/java/com/safecharge/model/AmountDetails.java rename to src/main/java/com/nuvei/model/AmountDetails.java index 589eddb..60e6367 100644 --- a/src/main/java/com/safecharge/model/AmountDetails.java +++ b/src/main/java/com/nuvei/model/AmountDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class AmountDetails { diff --git a/src/main/java/com/safecharge/model/AmountInfo.java b/src/main/java/com/nuvei/model/AmountInfo.java similarity index 93% rename from src/main/java/com/safecharge/model/AmountInfo.java rename to src/main/java/com/nuvei/model/AmountInfo.java index b5ec7e0..3fcbe1c 100644 --- a/src/main/java/com/safecharge/model/AmountInfo.java +++ b/src/main/java/com/nuvei/model/AmountInfo.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class AmountInfo { diff --git a/src/main/java/com/safecharge/model/ApiExternalToken.java b/src/main/java/com/nuvei/model/ApiExternalToken.java similarity index 98% rename from src/main/java/com/safecharge/model/ApiExternalToken.java rename to src/main/java/com/nuvei/model/ApiExternalToken.java index c2b8691..bdc315c 100644 --- a/src/main/java/com/safecharge/model/ApiExternalToken.java +++ b/src/main/java/com/nuvei/model/ApiExternalToken.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Holder for Checkout Page's Payment Gateway external token data. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/10/2017 */ public class ApiExternalToken { diff --git a/src/main/java/com/safecharge/model/AssuranceDetails.java b/src/main/java/com/nuvei/model/AssuranceDetails.java similarity index 85% rename from src/main/java/com/safecharge/model/AssuranceDetails.java rename to src/main/java/com/nuvei/model/AssuranceDetails.java index 9cf217f..d95f38b 100644 --- a/src/main/java/com/safecharge/model/AssuranceDetails.java +++ b/src/main/java/com/nuvei/model/AssuranceDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class AssuranceDetails { diff --git a/src/main/java/com/safecharge/model/BasePaymentOption.java b/src/main/java/com/nuvei/model/BasePaymentOption.java similarity index 78% rename from src/main/java/com/safecharge/model/BasePaymentOption.java rename to src/main/java/com/nuvei/model/BasePaymentOption.java index d2f433f..1841a35 100644 --- a/src/main/java/com/safecharge/model/BasePaymentOption.java +++ b/src/main/java/com/nuvei/model/BasePaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/BillingAddress.java b/src/main/java/com/nuvei/model/BillingAddress.java similarity index 89% rename from src/main/java/com/safecharge/model/BillingAddress.java rename to src/main/java/com/nuvei/model/BillingAddress.java index a6eaac8..bbbafea 100644 --- a/src/main/java/com/safecharge/model/BillingAddress.java +++ b/src/main/java/com/nuvei/model/BillingAddress.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class BillingAddress { diff --git a/src/main/java/com/safecharge/model/BrowserDetails.java b/src/main/java/com/nuvei/model/BrowserDetails.java similarity index 96% rename from src/main/java/com/safecharge/model/BrowserDetails.java rename to src/main/java/com/nuvei/model/BrowserDetails.java index d80990c..f699d8c 100644 --- a/src/main/java/com/safecharge/model/BrowserDetails.java +++ b/src/main/java/com/nuvei/model/BrowserDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Card.java b/src/main/java/com/nuvei/model/Card.java similarity index 91% rename from src/main/java/com/safecharge/model/Card.java rename to src/main/java/com/nuvei/model/Card.java index 6d9cdb0..d3d74c1 100644 --- a/src/main/java/com/safecharge/model/Card.java +++ b/src/main/java/com/nuvei/model/Card.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/CardData.java b/src/main/java/com/nuvei/model/CardData.java similarity index 93% rename from src/main/java/com/safecharge/model/CardData.java rename to src/main/java/com/nuvei/model/CardData.java index e8afbb0..4d3bd15 100644 --- a/src/main/java/com/safecharge/model/CardData.java +++ b/src/main/java/com/nuvei/model/CardData.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

* Holder for credit/debit/prepaid card data. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class CardData { diff --git a/src/main/java/com/safecharge/model/CardResponse.java b/src/main/java/com/nuvei/model/CardResponse.java similarity index 95% rename from src/main/java/com/safecharge/model/CardResponse.java rename to src/main/java/com/nuvei/model/CardResponse.java index 7ad5117..513c4af 100644 --- a/src/main/java/com/safecharge/model/CardResponse.java +++ b/src/main/java/com/nuvei/model/CardResponse.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; -import com.safecharge.response.ThreeDResponse; +import com.nuvei.response.ThreeDResponse; public class CardResponse { diff --git a/src/main/java/com/safecharge/model/CashierPaymentMethodDetails.java b/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java similarity index 93% rename from src/main/java/com/safecharge/model/CashierPaymentMethodDetails.java rename to src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java index 47eb5b5..4fb0ea1 100644 --- a/src/main/java/com/safecharge/model/CashierPaymentMethodDetails.java +++ b/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.Map; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; /** *

* Holder for an already saved Checkout Page's User Payment Option(UPO) data. It can hold credit/debit card or APM data. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 6/6/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.USER_DETAILS) diff --git a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java b/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java similarity index 97% rename from src/main/java/com/safecharge/model/CommonUserDetailsInfo.java rename to src/main/java/com/nuvei/model/CommonUserDetailsInfo.java index c85c383..0b615bb 100644 --- a/src/main/java/com/safecharge/model/CommonUserDetailsInfo.java +++ b/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public abstract class CommonUserDetailsInfo { diff --git a/src/main/java/com/safecharge/model/CompanyDetails.java b/src/main/java/com/nuvei/model/CompanyDetails.java similarity index 89% rename from src/main/java/com/safecharge/model/CompanyDetails.java rename to src/main/java/com/nuvei/model/CompanyDetails.java index 0846748..c314e19 100644 --- a/src/main/java/com/safecharge/model/CompanyDetails.java +++ b/src/main/java/com/nuvei/model/CompanyDetails.java @@ -1,4 +1,4 @@ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/CurrencyConversion.java b/src/main/java/com/nuvei/model/CurrencyConversion.java similarity index 88% rename from src/main/java/com/safecharge/model/CurrencyConversion.java rename to src/main/java/com/nuvei/model/CurrencyConversion.java index 3fbe713..2ad1c65 100644 --- a/src/main/java/com/safecharge/model/CurrencyConversion.java +++ b/src/main/java/com/nuvei/model/CurrencyConversion.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/safecharge/model/DeviceDetails.java b/src/main/java/com/nuvei/model/DeviceDetails.java similarity index 90% rename from src/main/java/com/safecharge/model/DeviceDetails.java rename to src/main/java/com/nuvei/model/DeviceDetails.java index ad3d7ce..a100194 100644 --- a/src/main/java/com/safecharge/model/DeviceDetails.java +++ b/src/main/java/com/nuvei/model/DeviceDetails.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

* Holder for a device data. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class DeviceDetails { diff --git a/src/main/java/com/safecharge/model/DynamicDescriptor.java b/src/main/java/com/nuvei/model/DynamicDescriptor.java similarity index 85% rename from src/main/java/com/safecharge/model/DynamicDescriptor.java rename to src/main/java/com/nuvei/model/DynamicDescriptor.java index e3608fb..725740e 100644 --- a/src/main/java/com/safecharge/model/DynamicDescriptor.java +++ b/src/main/java/com/nuvei/model/DynamicDescriptor.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

* This class allows the merchant to define a dynamic descriptor for its name and phone number, which will appear in the payment statement. *

* - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class DynamicDescriptor { diff --git a/src/main/java/com/safecharge/model/ExternalMpi.java b/src/main/java/com/nuvei/model/ExternalMpi.java similarity index 97% rename from src/main/java/com/safecharge/model/ExternalMpi.java rename to src/main/java/com/nuvei/model/ExternalMpi.java index 162946d..876ee9f 100644 --- a/src/main/java/com/safecharge/model/ExternalMpi.java +++ b/src/main/java/com/nuvei/model/ExternalMpi.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/ExternalSchemeDetails.java b/src/main/java/com/nuvei/model/ExternalSchemeDetails.java similarity index 81% rename from src/main/java/com/safecharge/model/ExternalSchemeDetails.java rename to src/main/java/com/nuvei/model/ExternalSchemeDetails.java index 6ccd455..c3c9ed6 100644 --- a/src/main/java/com/safecharge/model/ExternalSchemeDetails.java +++ b/src/main/java/com/nuvei/model/ExternalSchemeDetails.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class ExternalSchemeDetails { diff --git a/src/main/java/com/safecharge/model/ExternalToken.java b/src/main/java/com/nuvei/model/ExternalToken.java similarity index 91% rename from src/main/java/com/safecharge/model/ExternalToken.java rename to src/main/java/com/nuvei/model/ExternalToken.java index ff8136c..52f8862 100644 --- a/src/main/java/com/safecharge/model/ExternalToken.java +++ b/src/main/java/com/nuvei/model/ExternalToken.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/ExternalTokenInfo.java b/src/main/java/com/nuvei/model/ExternalTokenInfo.java similarity index 98% rename from src/main/java/com/safecharge/model/ExternalTokenInfo.java rename to src/main/java/com/nuvei/model/ExternalTokenInfo.java index 7dc95b9..8d2c555 100644 --- a/src/main/java/com/safecharge/model/ExternalTokenInfo.java +++ b/src/main/java/com/nuvei/model/ExternalTokenInfo.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class ExternalTokenInfo { diff --git a/src/main/java/com/safecharge/model/ExternalTokenProvider.java b/src/main/java/com/nuvei/model/ExternalTokenProvider.java similarity index 85% rename from src/main/java/com/safecharge/model/ExternalTokenProvider.java rename to src/main/java/com/nuvei/model/ExternalTokenProvider.java index c6c54c4..7620c82 100644 --- a/src/main/java/com/safecharge/model/ExternalTokenProvider.java +++ b/src/main/java/com/nuvei/model/ExternalTokenProvider.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Field.java b/src/main/java/com/nuvei/model/Field.java similarity index 92% rename from src/main/java/com/safecharge/model/Field.java rename to src/main/java/com/nuvei/model/Field.java index f94d6b9..23f4aed 100644 --- a/src/main/java/com/safecharge/model/Field.java +++ b/src/main/java/com/nuvei/model/Field.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.List; @@ -11,7 +11,7 @@ * Holder for Checkout Page's Merchant's specific info. For example: order id, account name, etc. in the Merchant's ERP system. * The data in the field can be validated by regular expression. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 4/7/2017 */ public class Field { diff --git a/src/main/java/com/safecharge/model/FraudDetails.java b/src/main/java/com/nuvei/model/FraudDetails.java similarity index 91% rename from src/main/java/com/safecharge/model/FraudDetails.java rename to src/main/java/com/nuvei/model/FraudDetails.java index 35a8117..5d61475 100644 --- a/src/main/java/com/safecharge/model/FraudDetails.java +++ b/src/main/java/com/nuvei/model/FraudDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class FraudDetails { diff --git a/src/main/java/com/safecharge/model/FraudDetailsSystem.java b/src/main/java/com/nuvei/model/FraudDetailsSystem.java similarity index 92% rename from src/main/java/com/safecharge/model/FraudDetailsSystem.java rename to src/main/java/com/nuvei/model/FraudDetailsSystem.java index 55200f1..bbba09a 100644 --- a/src/main/java/com/safecharge/model/FraudDetailsSystem.java +++ b/src/main/java/com/nuvei/model/FraudDetailsSystem.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.List; diff --git a/src/main/java/com/safecharge/model/FraudRule.java b/src/main/java/com/nuvei/model/FraudRule.java similarity index 90% rename from src/main/java/com/safecharge/model/FraudRule.java rename to src/main/java/com/nuvei/model/FraudRule.java index b7069e9..bb6e7e8 100644 --- a/src/main/java/com/safecharge/model/FraudRule.java +++ b/src/main/java/com/nuvei/model/FraudRule.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class FraudRule { diff --git a/src/main/java/com/safecharge/model/InitPaymentCard.java b/src/main/java/com/nuvei/model/InitPaymentCard.java similarity index 87% rename from src/main/java/com/safecharge/model/InitPaymentCard.java rename to src/main/java/com/nuvei/model/InitPaymentCard.java index ba909d1..34358e0 100644 --- a/src/main/java/com/safecharge/model/InitPaymentCard.java +++ b/src/main/java/com/nuvei/model/InitPaymentCard.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class InitPaymentCard extends CardData { diff --git a/src/main/java/com/safecharge/model/InitPaymentPaymentOption.java b/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java similarity index 72% rename from src/main/java/com/safecharge/model/InitPaymentPaymentOption.java rename to src/main/java/com/nuvei/model/InitPaymentPaymentOption.java index 012c58c..0f7aec1 100644 --- a/src/main/java/com/safecharge/model/InitPaymentPaymentOption.java +++ b/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class InitPaymentPaymentOption extends BasePaymentOption { diff --git a/src/main/java/com/safecharge/model/InitPaymentThreeD.java b/src/main/java/com/nuvei/model/InitPaymentThreeD.java similarity index 86% rename from src/main/java/com/safecharge/model/InitPaymentThreeD.java rename to src/main/java/com/nuvei/model/InitPaymentThreeD.java index 35efda2..51b6865 100644 --- a/src/main/java/com/safecharge/model/InitPaymentThreeD.java +++ b/src/main/java/com/nuvei/model/InitPaymentThreeD.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Item.java b/src/main/java/com/nuvei/model/Item.java similarity index 95% rename from src/main/java/com/safecharge/model/Item.java rename to src/main/java/com/nuvei/model/Item.java index 253fed1..07b22c9 100644 --- a/src/main/java/com/safecharge/model/Item.java +++ b/src/main/java/com/nuvei/model/Item.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -11,7 +11,7 @@ *

* Holder for Checkout Page's Merchant's item info. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class Item { diff --git a/src/main/java/com/safecharge/model/LocalizationMessage.java b/src/main/java/com/nuvei/model/LocalizationMessage.java similarity index 84% rename from src/main/java/com/safecharge/model/LocalizationMessage.java rename to src/main/java/com/nuvei/model/LocalizationMessage.java index 4f25bf5..782abe0 100644 --- a/src/main/java/com/safecharge/model/LocalizationMessage.java +++ b/src/main/java/com/nuvei/model/LocalizationMessage.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Holder used to store localized messages. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 4/7/2017 */ public class LocalizationMessage { diff --git a/src/main/java/com/safecharge/model/MerchantBaseInfo.java b/src/main/java/com/nuvei/model/MerchantBaseInfo.java similarity index 78% rename from src/main/java/com/safecharge/model/MerchantBaseInfo.java rename to src/main/java/com/nuvei/model/MerchantBaseInfo.java index 4d3f31c..a63fc5a 100644 --- a/src/main/java/com/safecharge/model/MerchantBaseInfo.java +++ b/src/main/java/com/nuvei/model/MerchantBaseInfo.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; -import com.safecharge.util.Constants; +import com.nuvei.util.Constants; /** *

* Holder for the required for a payment Checkout Page's Merchant's data such as * secret key, the merchant id, the merchant site id, etc. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ public class MerchantBaseInfo { @@ -29,8 +29,8 @@ public class MerchantBaseInfo { /** * Constructs a {@link MerchantInfo} object with data from the params. * - * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Safecharge - * @param serverHost The Safecharge's server address to send the request to + * @param merchantKey The secret merchant key obtained by the Merchant during integration process with nuvei + * @param serverHost The Nuvei's server address to send the request to * @param hashAlgorithm The hashing algorithm used to generate the checksum */ public MerchantBaseInfo(String merchantKey, String serverHost, Constants.HashAlgorithm hashAlgorithm) { diff --git a/src/main/java/com/safecharge/model/MerchantDetails.java b/src/main/java/com/nuvei/model/MerchantDetails.java similarity index 97% rename from src/main/java/com/safecharge/model/MerchantDetails.java rename to src/main/java/com/nuvei/model/MerchantDetails.java index ae5b757..e616014 100644 --- a/src/main/java/com/safecharge/model/MerchantDetails.java +++ b/src/main/java/com/nuvei/model/MerchantDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; @@ -10,7 +10,7 @@ *

* Holder for Checkout Page's Merchant's specific uncategorized data. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ diff --git a/src/main/java/com/safecharge/model/MerchantInfo.java b/src/main/java/com/nuvei/model/MerchantInfo.java similarity index 77% rename from src/main/java/com/safecharge/model/MerchantInfo.java rename to src/main/java/com/nuvei/model/MerchantInfo.java index c74fb9f..4437d6e 100644 --- a/src/main/java/com/safecharge/model/MerchantInfo.java +++ b/src/main/java/com/nuvei/model/MerchantInfo.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; -import com.safecharge.util.Constants; +import com.nuvei.util.Constants; /** *

* Holder for the required for a payment Checkout Page's Merchant's data such as * secret key, the merchant id, the merchant site id, etc. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ public class MerchantInfo { @@ -35,10 +35,10 @@ public class MerchantInfo { /** * Constructs a {@link MerchantInfo} object with data from the params. * - * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Safecharge - * @param merchantId Merchant id in the Safecharge's system - * @param merchantSiteId Merchant site id in the Safecharge's system - * @param serverHost The Safecharge's server address to send the request to + * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Nuvei + * @param merchantId Merchant id in the Nuvei's system + * @param merchantSiteId Merchant site id in the Nuvei's system + * @param serverHost The Nuvei's server address to send the request to * @param hashAlgorithm The hashing algorithm used to generate the checksum */ public MerchantInfo(String merchantKey, String merchantId, String merchantSiteId, String serverHost, Constants.HashAlgorithm hashAlgorithm) { diff --git a/src/main/java/com/safecharge/model/OpenAmount.java b/src/main/java/com/nuvei/model/OpenAmount.java similarity index 86% rename from src/main/java/com/safecharge/model/OpenAmount.java rename to src/main/java/com/nuvei/model/OpenAmount.java index 8151e59..26ad347 100644 --- a/src/main/java/com/safecharge/model/OpenAmount.java +++ b/src/main/java/com/nuvei/model/OpenAmount.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/OpenOrderCard.java b/src/main/java/com/nuvei/model/OpenOrderCard.java similarity index 83% rename from src/main/java/com/safecharge/model/OpenOrderCard.java rename to src/main/java/com/nuvei/model/OpenOrderCard.java index 313ce04..a9dc799 100644 --- a/src/main/java/com/safecharge/model/OpenOrderCard.java +++ b/src/main/java/com/nuvei/model/OpenOrderCard.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Holder for Checkout Page's OpenOrder PaymentOption card data. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 3/10/2017 */ public class OpenOrderCard { diff --git a/src/main/java/com/safecharge/model/OpenOrderPaymentOption.java b/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java similarity index 69% rename from src/main/java/com/safecharge/model/OpenOrderPaymentOption.java rename to src/main/java/com/nuvei/model/OpenOrderPaymentOption.java index be476e1..30023d7 100644 --- a/src/main/java/com/safecharge/model/OpenOrderPaymentOption.java +++ b/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class OpenOrderPaymentOption { diff --git a/src/main/java/com/safecharge/model/OpenOrderThreeD.java b/src/main/java/com/nuvei/model/OpenOrderThreeD.java similarity index 93% rename from src/main/java/com/safecharge/model/OpenOrderThreeD.java rename to src/main/java/com/nuvei/model/OpenOrderThreeD.java index 42402b8..368d57d 100644 --- a/src/main/java/com/safecharge/model/OpenOrderThreeD.java +++ b/src/main/java/com/nuvei/model/OpenOrderThreeD.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; diff --git a/src/main/java/com/safecharge/model/OpenOrderThreeDV2AdditionalParams.java b/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java similarity index 96% rename from src/main/java/com/safecharge/model/OpenOrderThreeDV2AdditionalParams.java rename to src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java index 4deba90..ad5fd9c 100644 --- a/src/main/java/com/safecharge/model/OpenOrderThreeDV2AdditionalParams.java +++ b/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/PartialApprovalDetails.java b/src/main/java/com/nuvei/model/PartialApprovalDetails.java similarity index 89% rename from src/main/java/com/safecharge/model/PartialApprovalDetails.java rename to src/main/java/com/nuvei/model/PartialApprovalDetails.java index e744f30..66be93f 100644 --- a/src/main/java/com/safecharge/model/PartialApprovalDetails.java +++ b/src/main/java/com/nuvei/model/PartialApprovalDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PartialApprovalDetails { diff --git a/src/main/java/com/safecharge/model/PaymentDetailsAlternativePaymentMethod.java b/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java similarity index 95% rename from src/main/java/com/safecharge/model/PaymentDetailsAlternativePaymentMethod.java rename to src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java index 82a4955..914f4cf 100644 --- a/src/main/java/com/safecharge/model/PaymentDetailsAlternativePaymentMethod.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentDetailsAlternativePaymentMethod { diff --git a/src/main/java/com/safecharge/model/PaymentDetailsCard.java b/src/main/java/com/nuvei/model/PaymentDetailsCard.java similarity index 81% rename from src/main/java/com/safecharge/model/PaymentDetailsCard.java rename to src/main/java/com/nuvei/model/PaymentDetailsCard.java index 5d408c6..8bc8278 100644 --- a/src/main/java/com/safecharge/model/PaymentDetailsCard.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsCard.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentDetailsCard { diff --git a/src/main/java/com/safecharge/model/PaymentDetailsPaymentOption.java b/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java similarity index 90% rename from src/main/java/com/safecharge/model/PaymentDetailsPaymentOption.java rename to src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java index e5e9db3..e8f32b2 100644 --- a/src/main/java/com/safecharge/model/PaymentDetailsPaymentOption.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentDetailsPaymentOption { diff --git a/src/main/java/com/safecharge/model/PaymentDetailsThreeD.java b/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java similarity index 75% rename from src/main/java/com/safecharge/model/PaymentDetailsThreeD.java rename to src/main/java/com/nuvei/model/PaymentDetailsThreeD.java index 77255f9..0454496 100644 --- a/src/main/java/com/safecharge/model/PaymentDetailsThreeD.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentDetailsThreeD { diff --git a/src/main/java/com/safecharge/model/PaymentInfo.java b/src/main/java/com/nuvei/model/PaymentInfo.java similarity index 90% rename from src/main/java/com/safecharge/model/PaymentInfo.java rename to src/main/java/com/nuvei/model/PaymentInfo.java index 8f03c33..ecde2a8 100644 --- a/src/main/java/com/safecharge/model/PaymentInfo.java +++ b/src/main/java/com/nuvei/model/PaymentInfo.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentInfo { diff --git a/src/main/java/com/safecharge/model/PaymentMethod.java b/src/main/java/com/nuvei/model/PaymentMethod.java similarity index 94% rename from src/main/java/com/safecharge/model/PaymentMethod.java rename to src/main/java/com/nuvei/model/PaymentMethod.java index 108b861..c9555e8 100644 --- a/src/main/java/com/safecharge/model/PaymentMethod.java +++ b/src/main/java/com/nuvei/model/PaymentMethod.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.List; @@ -11,7 +11,7 @@ * Holder for a Checkout Page's Payment method(PM) data. * Along with PM's specific info it contains a list of allowed countries and currencies ISO codes for use with the PM. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 4/7/2017 */ public class PaymentMethod { diff --git a/src/main/java/com/safecharge/model/PaymentMethodDetails.java b/src/main/java/com/nuvei/model/PaymentMethodDetails.java similarity index 94% rename from src/main/java/com/safecharge/model/PaymentMethodDetails.java rename to src/main/java/com/nuvei/model/PaymentMethodDetails.java index f94da4d..5c4902a 100644 --- a/src/main/java/com/safecharge/model/PaymentMethodDetails.java +++ b/src/main/java/com/nuvei/model/PaymentMethodDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentMethodDetails { diff --git a/src/main/java/com/safecharge/model/PaymentOption.java b/src/main/java/com/nuvei/model/PaymentOption.java similarity index 92% rename from src/main/java/com/safecharge/model/PaymentOption.java rename to src/main/java/com/nuvei/model/PaymentOption.java index c2eec3a..b9c845f 100644 --- a/src/main/java/com/safecharge/model/PaymentOption.java +++ b/src/main/java/com/nuvei/model/PaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; import java.util.Map; diff --git a/src/main/java/com/safecharge/model/PaymentOptionResponse.java b/src/main/java/com/nuvei/model/PaymentOptionResponse.java similarity index 90% rename from src/main/java/com/safecharge/model/PaymentOptionResponse.java rename to src/main/java/com/nuvei/model/PaymentOptionResponse.java index baa490f..4671b47 100644 --- a/src/main/java/com/safecharge/model/PaymentOptionResponse.java +++ b/src/main/java/com/nuvei/model/PaymentOptionResponse.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class PaymentOptionResponse { diff --git a/src/main/java/com/safecharge/model/Proxy.java b/src/main/java/com/nuvei/model/Proxy.java similarity index 74% rename from src/main/java/com/safecharge/model/Proxy.java rename to src/main/java/com/nuvei/model/Proxy.java index 474cfc0..7db0eac 100644 --- a/src/main/java/com/safecharge/model/Proxy.java +++ b/src/main/java/com/nuvei/model/Proxy.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

- * Holder for the data needed to connect to the Safecharge's servers via Proxy. + * Holder for the data needed to connect to the Nuvei's servers via Proxy. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/15/2017 */ public class Proxy { diff --git a/src/main/java/com/safecharge/model/Rate.java b/src/main/java/com/nuvei/model/Rate.java similarity index 85% rename from src/main/java/com/safecharge/model/Rate.java rename to src/main/java/com/nuvei/model/Rate.java index a40dbc3..aa125af 100644 --- a/src/main/java/com/safecharge/model/Rate.java +++ b/src/main/java/com/nuvei/model/Rate.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import java.util.List; diff --git a/src/main/java/com/safecharge/model/RateByCurrency.java b/src/main/java/com/nuvei/model/RateByCurrency.java similarity index 79% rename from src/main/java/com/safecharge/model/RateByCurrency.java rename to src/main/java/com/nuvei/model/RateByCurrency.java index 0e00c2d..43a658b 100644 --- a/src/main/java/com/safecharge/model/RateByCurrency.java +++ b/src/main/java/com/nuvei/model/RateByCurrency.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class RateByCurrency { diff --git a/src/main/java/com/safecharge/model/RecipientDetails.java b/src/main/java/com/nuvei/model/RecipientDetails.java similarity index 85% rename from src/main/java/com/safecharge/model/RecipientDetails.java rename to src/main/java/com/nuvei/model/RecipientDetails.java index b1595ac..6251f9f 100644 --- a/src/main/java/com/safecharge/model/RecipientDetails.java +++ b/src/main/java/com/nuvei/model/RecipientDetails.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/RefundPaymentOption.java b/src/main/java/com/nuvei/model/RefundPaymentOption.java similarity index 89% rename from src/main/java/com/safecharge/model/RefundPaymentOption.java rename to src/main/java/com/nuvei/model/RefundPaymentOption.java index 2146e1c..d0204d6 100644 --- a/src/main/java/com/safecharge/model/RefundPaymentOption.java +++ b/src/main/java/com/nuvei/model/RefundPaymentOption.java @@ -1,9 +1,9 @@ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.util.AtLeastOneFieldPresent; +import com.nuvei.util.AtLeastOneFieldPresent; @AtLeastOneFieldPresent(fields = {"card", "userPaymentOptionId"}, message = "Either \"card\" or \"userPaymentOptionId\" must be defined") public class RefundPaymentOption { diff --git a/src/main/java/com/safecharge/model/RestApiUserDetails.java b/src/main/java/com/nuvei/model/RestApiUserDetails.java similarity index 97% rename from src/main/java/com/safecharge/model/RestApiUserDetails.java rename to src/main/java/com/nuvei/model/RestApiUserDetails.java index 2161979..e9049bd 100644 --- a/src/main/java/com/safecharge/model/RestApiUserDetails.java +++ b/src/main/java/com/nuvei/model/RestApiUserDetails.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

diff --git a/src/main/java/com/safecharge/model/RiskInfo.java b/src/main/java/com/nuvei/model/RiskInfo.java similarity index 96% rename from src/main/java/com/safecharge/model/RiskInfo.java rename to src/main/java/com/nuvei/model/RiskInfo.java index 8b5953f..1540d63 100644 --- a/src/main/java/com/safecharge/model/RiskInfo.java +++ b/src/main/java/com/nuvei/model/RiskInfo.java @@ -1,4 +1,4 @@ -package com.safecharge.model; +package com.nuvei.model; public class RiskInfo { diff --git a/src/main/java/com/safecharge/model/Sdk.java b/src/main/java/com/nuvei/model/Sdk.java similarity index 95% rename from src/main/java/com/safecharge/model/Sdk.java rename to src/main/java/com/nuvei/model/Sdk.java index be24b75..aab01df 100644 --- a/src/main/java/com/safecharge/model/Sdk.java +++ b/src/main/java/com/nuvei/model/Sdk.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/SdkResponse.java b/src/main/java/com/nuvei/model/SdkResponse.java similarity index 73% rename from src/main/java/com/safecharge/model/SdkResponse.java rename to src/main/java/com/nuvei/model/SdkResponse.java index 51f1ff2..62a4b8e 100644 --- a/src/main/java/com/safecharge/model/SdkResponse.java +++ b/src/main/java/com/nuvei/model/SdkResponse.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class SdkResponse { diff --git a/src/main/java/com/safecharge/model/ShippingTrackingDetails.java b/src/main/java/com/nuvei/model/ShippingTrackingDetails.java similarity index 97% rename from src/main/java/com/safecharge/model/ShippingTrackingDetails.java rename to src/main/java/com/nuvei/model/ShippingTrackingDetails.java index 43498df..1eb74e3 100644 --- a/src/main/java/com/safecharge/model/ShippingTrackingDetails.java +++ b/src/main/java/com/nuvei/model/ShippingTrackingDetails.java @@ -1,4 +1,4 @@ -package com.safecharge.model; +package com.nuvei.model; public class ShippingTrackingDetails { diff --git a/src/main/java/com/safecharge/model/StoredCredentials.java b/src/main/java/com/nuvei/model/StoredCredentials.java similarity index 85% rename from src/main/java/com/safecharge/model/StoredCredentials.java rename to src/main/java/com/nuvei/model/StoredCredentials.java index b650431..3724136 100644 --- a/src/main/java/com/safecharge/model/StoredCredentials.java +++ b/src/main/java/com/nuvei/model/StoredCredentials.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/SubMerchant.java b/src/main/java/com/nuvei/model/SubMerchant.java similarity index 89% rename from src/main/java/com/safecharge/model/SubMerchant.java rename to src/main/java/com/nuvei/model/SubMerchant.java index 312731b..4746f9d 100644 --- a/src/main/java/com/safecharge/model/SubMerchant.java +++ b/src/main/java/com/nuvei/model/SubMerchant.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/SubMethod.java b/src/main/java/com/nuvei/model/SubMethod.java similarity index 85% rename from src/main/java/com/safecharge/model/SubMethod.java rename to src/main/java/com/nuvei/model/SubMethod.java index 2ee8ca2..a54f250 100644 --- a/src/main/java/com/safecharge/model/SubMethod.java +++ b/src/main/java/com/nuvei/model/SubMethod.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class SubMethod { diff --git a/src/main/java/com/safecharge/model/SubMethodDetails.java b/src/main/java/com/nuvei/model/SubMethodDetails.java similarity index 91% rename from src/main/java/com/safecharge/model/SubMethodDetails.java rename to src/main/java/com/nuvei/model/SubMethodDetails.java index d3fb836..cba3121 100644 --- a/src/main/java/com/safecharge/model/SubMethodDetails.java +++ b/src/main/java/com/nuvei/model/SubMethodDetails.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; /** * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 8/7/2018 */ public class SubMethodDetails { diff --git a/src/main/java/com/safecharge/model/SubscriptionPlan.java b/src/main/java/com/nuvei/model/SubscriptionPlan.java similarity index 96% rename from src/main/java/com/safecharge/model/SubscriptionPlan.java rename to src/main/java/com/nuvei/model/SubscriptionPlan.java index 7622de1..99fb924 100644 --- a/src/main/java/com/safecharge/model/SubscriptionPlan.java +++ b/src/main/java/com/nuvei/model/SubscriptionPlan.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Holder for the data needed to create subscription(a recurring payment). Based on the data provided * the Checkout Page's Merchant's client is billed automatically by the Checkout Page system. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 6/6/2017 */ public class SubscriptionPlan { diff --git a/src/main/java/com/safecharge/model/SubscriptionsListElement.java b/src/main/java/com/nuvei/model/SubscriptionsListElement.java similarity index 94% rename from src/main/java/com/safecharge/model/SubscriptionsListElement.java rename to src/main/java/com/nuvei/model/SubscriptionsListElement.java index 406e97a..f5fcf13 100644 --- a/src/main/java/com/safecharge/model/SubscriptionsListElement.java +++ b/src/main/java/com/nuvei/model/SubscriptionsListElement.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; /** *

* Holder for subscription data, such as the id of the {@link SubscriptionPlan}, * the status and creation date of the subscription, which user and UPO it is associated with, etc. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 6/6/2017 */ public class SubscriptionsListElement { diff --git a/src/main/java/com/safecharge/model/ThreeD.java b/src/main/java/com/nuvei/model/ThreeD.java similarity index 97% rename from src/main/java/com/safecharge/model/ThreeD.java rename to src/main/java/com/nuvei/model/ThreeD.java index 7a51aea..5fed957 100644 --- a/src/main/java/com/safecharge/model/ThreeD.java +++ b/src/main/java/com/nuvei/model/ThreeD.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/TokenizationData.java b/src/main/java/com/nuvei/model/TokenizationData.java similarity index 78% rename from src/main/java/com/safecharge/model/TokenizationData.java rename to src/main/java/com/nuvei/model/TokenizationData.java index c3b9750..84cdfea 100644 --- a/src/main/java/com/safecharge/model/TokenizationData.java +++ b/src/main/java/com/nuvei/model/TokenizationData.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; public class TokenizationData { private String type; diff --git a/src/main/java/com/safecharge/model/UrlDetails.java b/src/main/java/com/nuvei/model/UrlDetails.java similarity index 91% rename from src/main/java/com/safecharge/model/UrlDetails.java rename to src/main/java/com/nuvei/model/UrlDetails.java index 66a5f41..fcc12cf 100644 --- a/src/main/java/com/safecharge/model/UrlDetails.java +++ b/src/main/java/com/nuvei/model/UrlDetails.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; /** *

* Holder for Checkout Page's Merchant's specific URL to redirect to in case of successful, pending, failed transaction. * It also contains a URL to which to send a Direct Merchant Notification(DMN) with the result of the transaction. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.URL_DETAILS_CHECKSUM_MAPPING) diff --git a/src/main/java/com/safecharge/model/UserAddress.java b/src/main/java/com/nuvei/model/UserAddress.java similarity index 96% rename from src/main/java/com/safecharge/model/UserAddress.java rename to src/main/java/com/nuvei/model/UserAddress.java index f0d1421..03387f8 100644 --- a/src/main/java/com/safecharge/model/UserAddress.java +++ b/src/main/java/com/nuvei/model/UserAddress.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

* Holder for an User's billing or shipping address. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class UserAddress { diff --git a/src/main/java/com/safecharge/model/UserDetails.java b/src/main/java/com/nuvei/model/UserDetails.java similarity index 78% rename from src/main/java/com/safecharge/model/UserDetails.java rename to src/main/java/com/nuvei/model/UserDetails.java index 2f27bab..c8bac03 100644 --- a/src/main/java/com/safecharge/model/UserDetails.java +++ b/src/main/java/com/nuvei/model/UserDetails.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; /** *

* Holder for User's personal details and a "generic" address. Note that a User can have different billing/shipping * address per order stored in {@link UserAddress} object. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.USER_DETAILS) diff --git a/src/main/java/com/safecharge/model/UserDetailsCashier.java b/src/main/java/com/nuvei/model/UserDetailsCashier.java similarity index 87% rename from src/main/java/com/safecharge/model/UserDetailsCashier.java rename to src/main/java/com/nuvei/model/UserDetailsCashier.java index cd5046d..9c01887 100644 --- a/src/main/java/com/safecharge/model/UserDetailsCashier.java +++ b/src/main/java/com/nuvei/model/UserDetailsCashier.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.USER_DETAILS) public class UserDetailsCashier extends CommonUserDetailsInfo { diff --git a/src/main/java/com/safecharge/model/UserPaymentOption.java b/src/main/java/com/nuvei/model/UserPaymentOption.java similarity index 84% rename from src/main/java/com/safecharge/model/UserPaymentOption.java rename to src/main/java/com/nuvei/model/UserPaymentOption.java index a1995c1..16f1b67 100644 --- a/src/main/java/com/safecharge/model/UserPaymentOption.java +++ b/src/main/java/com/nuvei/model/UserPaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -11,7 +11,7 @@ *

* Holder for User Payment Option(UPO) data. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ public class UserPaymentOption { diff --git a/src/main/java/com/safecharge/model/V2AdditionalParams.java b/src/main/java/com/nuvei/model/V2AdditionalParams.java similarity index 97% rename from src/main/java/com/safecharge/model/V2AdditionalParams.java rename to src/main/java/com/nuvei/model/V2AdditionalParams.java index f0fcd2a..6fe34a2 100644 --- a/src/main/java/com/safecharge/model/V2AdditionalParams.java +++ b/src/main/java/com/nuvei/model/V2AdditionalParams.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/model/Verify3dCard.java b/src/main/java/com/nuvei/model/Verify3dCard.java similarity index 74% rename from src/main/java/com/safecharge/model/Verify3dCard.java rename to src/main/java/com/nuvei/model/Verify3dCard.java index bbfa588..10ecffc 100644 --- a/src/main/java/com/safecharge/model/Verify3dCard.java +++ b/src/main/java/com/nuvei/model/Verify3dCard.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; diff --git a/src/main/java/com/safecharge/model/Verify3dPaymentOption.java b/src/main/java/com/nuvei/model/Verify3dPaymentOption.java similarity index 74% rename from src/main/java/com/safecharge/model/Verify3dPaymentOption.java rename to src/main/java/com/nuvei/model/Verify3dPaymentOption.java index 71b07e0..8ca072c 100644 --- a/src/main/java/com/safecharge/model/Verify3dPaymentOption.java +++ b/src/main/java/com/nuvei/model/Verify3dPaymentOption.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.Valid; diff --git a/src/main/java/com/safecharge/model/Verify3dThreeD.java b/src/main/java/com/nuvei/model/Verify3dThreeD.java similarity index 89% rename from src/main/java/com/safecharge/model/Verify3dThreeD.java rename to src/main/java/com/nuvei/model/Verify3dThreeD.java index f4f259c..0065d89 100644 --- a/src/main/java/com/safecharge/model/Verify3dThreeD.java +++ b/src/main/java/com/nuvei/model/Verify3dThreeD.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.model; +package com.nuvei.model; import javax.validation.constraints.Size; diff --git a/src/main/java/com/safecharge/request/AccountCaptureRequest.java b/src/main/java/com/nuvei/request/AccountCaptureRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/AccountCaptureRequest.java rename to src/main/java/com/nuvei/request/AccountCaptureRequest.java index 5397c92..7ba92e4 100644 --- a/src/main/java/com/safecharge/request/AccountCaptureRequest.java +++ b/src/main/java/com/nuvei/request/AccountCaptureRequest.java @@ -1,25 +1,25 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserDetails; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserDetails; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class AccountCaptureRequest extends SafechargeRequest { +public class AccountCaptureRequest extends NuveiRequest { @NotNull @Size(max = 255) @@ -154,7 +154,7 @@ public static Builder builder() { return new Builder(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String paymentMethod; diff --git a/src/main/java/com/safecharge/request/AddUPOAPMRequest.java b/src/main/java/com/nuvei/request/AddUPOAPMRequest.java similarity index 87% rename from src/main/java/com/safecharge/request/AddUPOAPMRequest.java rename to src/main/java/com/nuvei/request/AddUPOAPMRequest.java index e368e3c..16c4b75 100644 --- a/src/main/java/com/safecharge/request/AddUPOAPMRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOAPMRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import java.util.HashMap; import java.util.Map; @@ -11,13 +11,13 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.UserDetails; -import com.safecharge.model.UserDetailsCashier; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.UserDetails; +import com.nuvei.model.UserDetailsCashier; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -26,17 +26,17 @@ * The goal of this request is to add an APM UPO account for specific users according to their User Token ID. * Once an APM UPO is added to a consumer’s UPO list, the APM is displayed in the user’s available payment options on the payment page. * - * @author Nikola Dichev + * @author Nikola Dichev * @see AddUPOCreditCardByTempTokenRequest * @see AddUPOCreditCardRequest - * @see com.safecharge.response.AddUPOAPMResponse + * @see com.nuvei.response.AddUPOAPMResponse * @since 3/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ADD_CASHIER_APM) -public class AddUPOAPMRequest extends SafechargeRequest { +public class AddUPOAPMRequest extends NuveiRequest { /** - * The unique name of the payment method in Checkout Page system (for example apmgw_Neteller). For a list of possible values, see APM Unique SafeCharge Checkout Names. + * The unique name of the payment method in Checkout Page system (for example apmgw_Neteller). For a list of possible values, see APM Unique Nuvei Checkout Names. */ @NotNull(message = "paymentMethodName parameter is mandatory!") private String paymentMethodName; @@ -114,7 +114,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { UserDetailsCashier billingAddress; private String paymentMethodName; @@ -128,7 +128,7 @@ public static class Builder extends SafechargeBuilder { * * @param paymentMethodName The unique name of the payment method in Checkout Page system. * @return this object - * @see APM account identifiers + * @see APM account identifiers */ public Builder addPaymentMethodName(String paymentMethodName) { this.paymentMethodName = paymentMethodName; @@ -212,11 +212,11 @@ public Builder addBillingAddress(String address, String city, String countryCode /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { AddUPOAPMRequest addUPOAPM = new AddUPOAPMRequest(); addUPOAPM.setPaymentMethodName(paymentMethodName); diff --git a/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java similarity index 88% rename from src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java rename to src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java index cff2cab..fcd8d01 100644 --- a/src/main/java/com/safecharge/request/AddUPOCreditCardByTempTokenRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java @@ -1,31 +1,31 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.UserAddress; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.UserAddress; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

* Request to add Credit/Debit card(via temporary token) User Payment Option to a User. *

- * When submitting consumer’s full credit card number, SafeCharge provides a temporary token in the response that + * When submitting consumer’s full credit card number, Nuvei provides a temporary token in the response that * represents the consumer’s credit card. - * The next time the consumer completes a transaction, the merchant sends SafeCharge the temporary token instead + * The next time the consumer completes a transaction, the merchant sends Nuvei the temporary token instead * of the consumer’s credit card information. The temporary token value represents the consumer’s credit card number. * - * @author Nikola Dichev + * @author Nikola Dichev * @see AddUPOAPMRequest * @see AddUPOCreditCardRequest * @see CardTokenizationRequest @@ -33,7 +33,7 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class AddUPOCreditCardByTempTokenRequest - extends SafechargeRequest { + extends NuveiRequest { /** * The unique identifier generated for each customer. @@ -100,7 +100,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String ccTempToken; @@ -118,7 +118,7 @@ public Builder addUserTokenId(String userTokenId) { } /** - * Adds temp token to the request. The temp token is a hash representation of the the {@link com.safecharge.model.CardData} + * Adds temp token to the request. The temp token is a hash representation of the the {@link com.nuvei.model.CardData} * * @param ccTempToken hash of the credit card * @return this object @@ -195,11 +195,11 @@ public Builder addBillingAddress(UserAddress billingAddress) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { AddUPOCreditCardByTempTokenRequest addUPOCreditCardByTempTokenRequest = new AddUPOCreditCardByTempTokenRequest(); addUPOCreditCardByTempTokenRequest.setUserTokenId(userTokenId); addUPOCreditCardByTempTokenRequest.setCcTempToken(ccTempToken); diff --git a/src/main/java/com/safecharge/request/AddUPOCreditCardByTokenRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java similarity index 94% rename from src/main/java/com/safecharge/request/AddUPOCreditCardByTokenRequest.java rename to src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java index c3a7081..9b9fc52 100644 --- a/src/main/java/com/safecharge/request/AddUPOCreditCardByTokenRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; -import com.safecharge.model.UserDetailsCashier; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.APIConstants; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.UserDetailsCashier; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.APIConstants; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -23,11 +23,11 @@ * This goal of this request is to add a credit card UPO for a specific user according to their Temporary card token and User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 3/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ADD_CASHIER_CC_CARD_DATA) -public class AddUPOCreditCardByTokenRequest extends SafechargeRequest { +public class AddUPOCreditCardByTokenRequest extends NuveiRequest { /** * A hashed value of the credit card number. @@ -310,7 +310,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String ccToken; private String brand; @@ -440,11 +440,11 @@ public Builder addBillingAddress(String address, String city, String countryCode /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { AddUPOCreditCardByTokenRequest addUPOCreditCard = new AddUPOCreditCardByTokenRequest(); addUPOCreditCard.setCcToken(ccToken); addUPOCreditCard.setBrand(brand); diff --git a/src/main/java/com/safecharge/request/AddUPOCreditCardRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/AddUPOCreditCardRequest.java rename to src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java index b9509dd..e69966b 100644 --- a/src/main/java/com/safecharge/request/AddUPOCreditCardRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; -import com.safecharge.model.ExternalTokenProvider; -import com.safecharge.model.UserDetails; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.APIConstants; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.ExternalTokenProvider; +import com.nuvei.model.UserDetails; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.APIConstants; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -25,13 +25,13 @@ * This goal of this request is to add a credit card UPO for a specific user according to their User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Nikola Dichev + * @author Nikola Dichev * @see AddUPOAPMRequest * @see AddUPOCreditCardByTempTokenRequest * @since 3/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ADD_CASHIER_CC_CARD) -public class AddUPOCreditCardRequest extends SafechargeRequest { +public class AddUPOCreditCardRequest extends NuveiRequest { /** * A valid credit card number. @@ -160,7 +160,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String ccCardNumber; private String ccExpMonth; @@ -272,11 +272,11 @@ public Builder addExternalTokenProvider(ExternalTokenProvider externalTokenProvi /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { AddUPOCreditCardRequest addUPOCreditCard = new AddUPOCreditCardRequest(); addUPOCreditCard.setCcCardNumber(ccCardNumber); addUPOCreditCard.setCcExpMonth(ccExpMonth); diff --git a/src/main/java/com/safecharge/request/Authorization3DRequest.java b/src/main/java/com/nuvei/request/Authorization3DRequest.java similarity index 75% rename from src/main/java/com/safecharge/request/Authorization3DRequest.java rename to src/main/java/com/nuvei/request/Authorization3DRequest.java index 0e59511..2e223d2 100644 --- a/src/main/java/com/safecharge/request/Authorization3DRequest.java +++ b/src/main/java/com/nuvei/request/Authorization3DRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.*; -import com.safecharge.request.builder.SafechargeCCBuilder; -import com.safecharge.util.APIConstants; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiCCBuilder; +import com.nuvei.util.APIConstants; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -19,17 +19,17 @@ * This is the initial stage of the 3D secure payment process, providing the merchant with the necessary data, * and provides the card issuer/bank with the verification page URL. * - * @author Nikola Dichev + * @author Nikola Dichev * @see Payment3DRequest * @since 2/17/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class Authorization3DRequest - extends SafechargeCCRequest { + extends NuveiCCRequest { /** - * This parameter determines whether the 3DSecure rule engine is to be managed by SafeCharge (1) - * or the 3DSecure rule engine not managed by SafeCharge and method will always try to + * This parameter determines whether the 3DSecure rule engine is to be managed by Nuvei (1) + * or the 3DSecure rule engine not managed by Nuvei and method will always try to * send a 3DSecure transaction (0). */ @Pattern(regexp = APIConstants.IS_DYNAMIC_3D_REGEX, message = "isDynamic3D value is invalid") @@ -66,7 +66,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeCCBuilder { + public static class Builder extends NuveiCCBuilder { private String isDynamic3D; private String dynamic3DMode; @@ -74,8 +74,8 @@ public static class Builder extends SafechargeCCBuilder { /** * Adds the Dynamic3D parameter. * - * @param isDynamic3D This parameter determines whether the 3DSecure rule engine is to be managed by SafeCharge (1) - * or the 3DSecure rule engine not managed by SafeCharge and method will always try to + * @param isDynamic3D This parameter determines whether the 3DSecure rule engine is to be managed by Nuvei (1) + * or the 3DSecure rule engine not managed by Nuvei and method will always try to * send a 3DSecure transaction (0). * @return this object */ @@ -89,7 +89,7 @@ public Builder addIsDynamic3D(String isDynamic3D, String dynamic3DMode) { * {@inheritDoc} */ @Override - public SafechargeRequest build() { + public NuveiRequest build() { Authorization3DRequest request = new Authorization3DRequest(); request.setIsDynamic3D(isDynamic3D); request.setDynamic3DMode(dynamic3DMode); diff --git a/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java b/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java similarity index 96% rename from src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java rename to src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java index 3c60287..318a6b0 100644 --- a/src/main/java/com/safecharge/request/Authorize3dAndPaymentRequest.java +++ b/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.model.*; -import com.safecharge.request.builder.SafechargePaymentBuilder; +import com.nuvei.model.*; +import com.nuvei.request.builder.NuveiPaymentBuilder; -public abstract class Authorize3dAndPaymentRequest extends SafechargePaymentRequest { +public abstract class Authorize3dAndPaymentRequest extends NuveiPaymentRequest { @Valid private PaymentOption paymentOption; @@ -170,7 +170,7 @@ public void setCompanyDetails(CompanyDetails companyDetails) { this.companyDetails = companyDetails; } - public abstract static class Builder> extends SafechargePaymentBuilder { + public abstract static class Builder> extends NuveiPaymentBuilder { private PaymentOption paymentOption; private Integer isRebilling; diff --git a/src/main/java/com/safecharge/request/Authorize3dRequest.java b/src/main/java/com/nuvei/request/Authorize3dRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/Authorize3dRequest.java rename to src/main/java/com/nuvei/request/Authorize3dRequest.java index 81bd77e..5097218 100644 --- a/src/main/java/com/safecharge/request/Authorize3dRequest.java +++ b/src/main/java/com/nuvei/request/Authorize3dRequest.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -15,7 +15,7 @@ *

* Note that Authorize3d is virtually the same as the Payment request(has the same fields) but is executed against a different REST endpoint. *

- * see Authorize3d API + * see Authorize3d API * * @since 6/29/2020 *

diff --git a/src/main/java/com/safecharge/request/CancelSubscriptionRequest.java b/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java similarity index 79% rename from src/main/java/com/safecharge/request/CancelSubscriptionRequest.java rename to src/main/java/com/nuvei/request/CancelSubscriptionRequest.java index 8b53738..27fdb78 100644 --- a/src/main/java/com/safecharge/request/CancelSubscriptionRequest.java +++ b/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java @@ -1,32 +1,32 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

* Request to cancel existing subscription. * - * @author Nikola Dichev + * @author Nikola Dichev * @see CreateSubscriptionRequest * @since 6/5/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.CANCEL_CASHIER_SUBSCRIPTION) public class CancelSubscriptionRequest - extends SafechargeRequest { + extends NuveiRequest { /** - * The ID of the user’s active subscription in the SafeCharge’s system. + * The ID of the user’s active subscription in the Nuvei’s system. */ @NotNull(message = "subscriptionId mustn't be null") @Size(max = 20, message = "subscriptionId value size must be up to 20 characters") @@ -74,7 +74,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String subscriptionId; private String userTokenId; @@ -82,7 +82,7 @@ public static class Builder extends SafechargeBuilder * A request used to retrieve card details such as card brand and type. It will also return amount info. *

- * see getCardDetails + * see getCardDetails * * @since 7/27/2020 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class CardDetailsRequest extends SafechargeRequest { +public class CardDetailsRequest extends NuveiRequest { @Size(max = 45) private String clientUniqueId; @@ -61,7 +61,7 @@ public String toString() { '}'; } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String clientUniqueId; private String cardNumber; diff --git a/src/main/java/com/safecharge/request/CardTokenizationRequest.java b/src/main/java/com/nuvei/request/CardTokenizationRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/CardTokenizationRequest.java rename to src/main/java/com/nuvei/request/CardTokenizationRequest.java index ad8572b..b5275cf 100644 --- a/src/main/java/com/safecharge/request/CardTokenizationRequest.java +++ b/src/main/java/com/nuvei/request/CardTokenizationRequest.java @@ -1,23 +1,23 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import com.safecharge.model.CardData; -import com.safecharge.model.UserAddress; -import com.safecharge.request.builder.SafechargeBaseOrderBuilder; -import com.safecharge.util.APIConstants; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.CardUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.CardData; +import com.nuvei.model.UserAddress; +import com.nuvei.request.builder.NuveiBaseOrderBuilder; +import com.nuvei.util.APIConstants; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.CardUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -31,16 +31,16 @@ * However, they are able to use this {@link CardTokenizationRequest} directly. *

* Low-level PCI certified merchants that cannot enter card data on their side and use an online website are required to use - * the credit card tokenization client SDK, according to the instructions here + * the credit card tokenization client SDK, according to the instructions here * which performs credit card tokenization for them. * - * @author Nikola Dichev - * @see Credit Card tokenization + * @author Nikola Dichev + * @see Credit Card tokenization * @see AddUPOCreditCardByTempTokenRequest * @since 2/15/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class CardTokenizationRequest extends SafechargeBaseRequest { +public class CardTokenizationRequest extends NuveiBaseRequest { /** * Valid card details to generate the token for. @@ -137,7 +137,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBaseOrderBuilder { + public static class Builder extends NuveiBaseOrderBuilder { private CardData cardData; private UserAddress billingAddress; @@ -273,7 +273,7 @@ public Builder addIsVerified(Constants.VerifiedPaymentMethod isVerified) { * @return this object */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { CardTokenizationRequest cardTokenizationRequest = new CardTokenizationRequest(); cardTokenizationRequest.setUserTokenId(userTokenId); cardTokenizationRequest.setIpAddress(ipAddress); diff --git a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java b/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java similarity index 94% rename from src/main/java/com/safecharge/request/CreateSubscriptionRequest.java rename to src/main/java/com/nuvei/request/CreateSubscriptionRequest.java index 9a55a68..43886ca 100644 --- a/src/main/java/com/safecharge/request/CreateSubscriptionRequest.java +++ b/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; @@ -10,23 +10,23 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import com.safecharge.model.CardData; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserAddress; -import com.safecharge.model.UserPaymentOption; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.CardUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.DeviceUtils; -import com.safecharge.util.MerchantUtils; -import com.safecharge.util.UrlUtils; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.CardData; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserAddress; +import com.nuvei.model.UserPaymentOption; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.CardUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.DeviceUtils; +import com.nuvei.util.MerchantUtils; +import com.nuvei.util.UrlUtils; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -38,7 +38,7 @@ * The details of the subscription are stored in a previously created subscription plan. So no parameters related to the subscription * (e.g. initial amount, recurring amount, subscription duration, etc) are passed except the ID of the subscription plan. * - * @author Nikola Dichev + * @author Nikola Dichev * @see GetSubscriptionsListRequest * @see GetSubscriptionPlansRequest * @see CancelSubscriptionRequest @@ -46,7 +46,7 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.GET_CASHIER_SUBSCRIPTIONS) public class CreateSubscriptionRequest - extends SafechargeRequest { + extends NuveiRequest { /** * The ID of previously created subscription plan to add to the request. @@ -214,7 +214,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String subscriptionPlanId; private String initialTransactionId; @@ -479,7 +479,7 @@ public CreateSubscriptionRequest.Builder addCardData(String cardNumber, String c /** * Adds user payment option (UPO) to the request. It is the payment option that will be used for the transaction. * - * @param cvv the CVV code of the related credit/debit card. Note that CVV is not stored by Safecharge + * @param cvv the CVV code of the related credit/debit card. Note that CVV is not stored by Nuvei * @param userPaymentOptionId the id of the UPO to add to the request * @return this object */ @@ -562,11 +562,11 @@ public Builder addBillingAddress(UserAddress billingAddress) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { CreateSubscriptionRequest createSubscriptionRequest = new CreateSubscriptionRequest(); createSubscriptionRequest.setSubscriptionPlanId(subscriptionPlanId); createSubscriptionRequest.setInitialTransactionId(initialTransactionId); diff --git a/src/main/java/com/safecharge/request/CreateUserRequest.java b/src/main/java/com/nuvei/request/CreateUserRequest.java similarity index 51% rename from src/main/java/com/safecharge/request/CreateUserRequest.java rename to src/main/java/com/nuvei/request/CreateUserRequest.java index 7539064..5f7c547 100644 --- a/src/main/java/com/safecharge/request/CreateUserRequest.java +++ b/src/main/java/com/nuvei/request/CreateUserRequest.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.basic.CashierUserRequest; -import com.safecharge.request.builder.SafechargeCashierUserBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.basic.CashierUserRequest; +import com.nuvei.request.builder.NuveiCashierUserBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ADD_CASHIER_USER) public class CreateUserRequest extends CashierUserRequest { @@ -17,7 +17,7 @@ public static Builder builder() { return new Builder(); } - public static class Builder extends SafechargeCashierUserBuilder { + public static class Builder extends NuveiCashierUserBuilder { public CreateUserRequest build() { CreateUserRequest request = new CreateUserRequest(); diff --git a/src/main/java/com/safecharge/request/DccDetailsRequest.java b/src/main/java/com/nuvei/request/DccDetailsRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/DccDetailsRequest.java rename to src/main/java/com/nuvei/request/DccDetailsRequest.java index ed54f1c..f605eb3 100644 --- a/src/main/java/com/safecharge/request/DccDetailsRequest.java +++ b/src/main/java/com/nuvei/request/DccDetailsRequest.java @@ -1,23 +1,23 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.APIConstants; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.APIConstants; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class DccDetailsRequest extends SafechargeRequest{ +public class DccDetailsRequest extends NuveiRequest { @Size(max = 45) private String clientUniqueId; @@ -113,7 +113,7 @@ public String toString() { '}'; } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String clientUniqueId; private String cardNumber; diff --git a/src/main/java/com/safecharge/request/DeleteUPORequest.java b/src/main/java/com/nuvei/request/DeleteUPORequest.java similarity index 60% rename from src/main/java/com/safecharge/request/DeleteUPORequest.java rename to src/main/java/com/nuvei/request/DeleteUPORequest.java index 69f3603..a4b2e1c 100644 --- a/src/main/java/com/safecharge/request/DeleteUPORequest.java +++ b/src/main/java/com/nuvei/request/DeleteUPORequest.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.DELETE_UPO) public class DeleteUPORequest extends EditUPOBasicRequest { @@ -21,7 +21,7 @@ public static Builder builder() { public static class Builder extends EditUPOBasicRequest.Builder { @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { DeleteUPORequest deleteUPORequest = new DeleteUPORequest(); return ValidationUtils.validate(super.build(deleteUPORequest)); } diff --git a/src/main/java/com/nuvei/request/Dynamic3DRequest.java b/src/main/java/com/nuvei/request/Dynamic3DRequest.java new file mode 100644 index 0000000..54b77bf --- /dev/null +++ b/src/main/java/com/nuvei/request/Dynamic3DRequest.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.request; + +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; + +@ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) +public class Dynamic3DRequest extends Authorization3DRequest { + +} diff --git a/src/main/java/com/safecharge/request/EditUPOAPMRequest.java b/src/main/java/com/nuvei/request/EditUPOAPMRequest.java similarity index 88% rename from src/main/java/com/safecharge/request/EditUPOAPMRequest.java rename to src/main/java/com/nuvei/request/EditUPOAPMRequest.java index 14cb075..a8ecb7f 100644 --- a/src/main/java/com/safecharge/request/EditUPOAPMRequest.java +++ b/src/main/java/com/nuvei/request/EditUPOAPMRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import java.util.HashMap; import java.util.Map; @@ -11,13 +11,13 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.UserDetails; -import com.safecharge.model.UserDetailsCashier; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.UserDetails; +import com.nuvei.model.UserDetailsCashier; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -26,10 +26,10 @@ * The goal of this request is to add an APM UPO account for specific users according to their User Token ID. * Once an APM UPO is added to a consumer’s UPO list, the APM is displayed in the user’s available payment options on the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @see AddUPOCreditCardByTempTokenRequest * @see AddUPOCreditCardRequest - * @see com.safecharge.response.AddUPOAPMResponse + * @see com.nuvei.response.AddUPOAPMResponse * @since 1/29/2018 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.EDIT_CASHIER_APM) @@ -152,11 +152,11 @@ public EditUPOAPMRequest.Builder addBillingAddress(String address, String city, /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { EditUPOAPMRequest editUPOAPMRequest = new EditUPOAPMRequest(); editUPOAPMRequest.setApmData(apmData); diff --git a/src/main/java/com/safecharge/request/EditUPOCreditCardRequest.java b/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/EditUPOCreditCardRequest.java rename to src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java index b7f322e..12bc78c 100644 --- a/src/main/java/com/safecharge/request/EditUPOCreditCardRequest.java +++ b/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; -import com.safecharge.model.UserDetails; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.APIConstants; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.UserDetails; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.APIConstants; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -23,7 +23,7 @@ * This goal of this request is to add a credit card UPO for a specific user according to their User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 3/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.EDIT_CASHIER_CC_CARD) @@ -195,11 +195,11 @@ public EditUPOCreditCardRequest.Builder addBillingAddress(String firstName, Stri /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { EditUPOCreditCardRequest editUPOCreditCard = new EditUPOCreditCardRequest(); editUPOCreditCard.setCcExpMonth(ccExpMonth); editUPOCreditCard.setCcExpYear(ccExpYear); diff --git a/src/main/java/com/safecharge/request/EnableUPORequest.java b/src/main/java/com/nuvei/request/EnableUPORequest.java similarity index 61% rename from src/main/java/com/safecharge/request/EnableUPORequest.java rename to src/main/java/com/nuvei/request/EnableUPORequest.java index 9bfa35b..6c3764a 100644 --- a/src/main/java/com/safecharge/request/EnableUPORequest.java +++ b/src/main/java/com/nuvei/request/EnableUPORequest.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ENABLE_UPO) public class EnableUPORequest extends EditUPOBasicRequest { @@ -21,7 +21,7 @@ public static EnableUPORequest.Builder builder() { public static class Builder extends EditUPOBasicRequest.Builder { @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { EnableUPORequest enableUPORequest = new EnableUPORequest(); return ValidationUtils.validate(super.build(enableUPORequest)); } diff --git a/src/main/java/com/safecharge/request/GetMerchantPaymentMethodsRequest.java b/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java similarity index 88% rename from src/main/java/com/safecharge/request/GetMerchantPaymentMethodsRequest.java rename to src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java index 9ee0575..44fb7fa 100644 --- a/src/main/java/com/safecharge/request/GetMerchantPaymentMethodsRequest.java +++ b/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -20,12 +20,12 @@ * which may be filtered based on country, currency and language. * It may be used by the merchant mostly in order to display the available payment methods in its payment page. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 4/6/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class GetMerchantPaymentMethodsRequest - extends SafechargeRequest { + extends NuveiRequest { /** * The three letter ISO currency code that the transaction is to be completed in. @@ -95,7 +95,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String currencyCode; private String countryCode; @@ -143,11 +143,11 @@ public Builder addType(String type) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { GetMerchantPaymentMethodsRequest getMerchantPaymentMethodsRequest = new GetMerchantPaymentMethodsRequest(); super.build(getMerchantPaymentMethodsRequest); getMerchantPaymentMethodsRequest.setCountryCode(countryCode); diff --git a/src/main/java/com/safecharge/request/GetOrderDetailsRequest.java b/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java similarity index 75% rename from src/main/java/com/safecharge/request/GetOrderDetailsRequest.java rename to src/main/java/com/nuvei/request/GetOrderDetailsRequest.java index 1de80cf..17901bc 100644 --- a/src/main/java/com/safecharge/request/GetOrderDetailsRequest.java +++ b/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -19,13 +19,13 @@ * Enables receiving specific order details of an existing order. * Note that order details can be viewed at any point in time. * - * @author Nikola Dichev + * @author Nikola Dichev * @see OpenOrderRequest * @see UpdateOrderRequest * @since 2/15/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class GetOrderDetailsRequest extends SafechargeRequest implements SafechargeOrderRequest { +public class GetOrderDetailsRequest extends NuveiRequest implements NuveiOrderRequest { /** * MerchantOrderID to be used as input parameter in update method and payment methods. @@ -64,7 +64,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { String orderId; @@ -82,10 +82,10 @@ public Builder addOrderId(String orderId) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { GetOrderDetailsRequest request = new GetOrderDetailsRequest(); request.setOrderId(orderId); return ValidationUtils.validate(super.build(request)); diff --git a/src/main/java/com/safecharge/request/GetPaymentStatusRequest.java b/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java similarity index 61% rename from src/main/java/com/safecharge/request/GetPaymentStatusRequest.java rename to src/main/java/com/nuvei/request/GetPaymentStatusRequest.java index cab6738..5d85f25 100644 --- a/src/main/java/com/safecharge/request/GetPaymentStatusRequest.java +++ b/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class GetPaymentStatusRequest extends SafechargeRequest { +public class GetPaymentStatusRequest extends NuveiRequest { public static Builder builder() { return new Builder(); @@ -26,7 +26,7 @@ public String toString() { return super.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { @Override public GetPaymentStatusRequest build() throws ConstraintViolationException { diff --git a/src/main/java/com/safecharge/request/GetPayoutStatusRequest.java b/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java similarity index 61% rename from src/main/java/com/safecharge/request/GetPayoutStatusRequest.java rename to src/main/java/com/nuvei/request/GetPayoutStatusRequest.java index 6c7eacb..f9d1101 100644 --- a/src/main/java/com/safecharge/request/GetPayoutStatusRequest.java +++ b/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; import javax.validation.ConstraintViolationException; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class GetPayoutStatusRequest extends SafechargeRequest { +public class GetPayoutStatusRequest extends NuveiRequest { public static GetPayoutStatusRequest.Builder builder() { return new GetPayoutStatusRequest.Builder(); @@ -27,7 +27,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { @Override public GetPayoutStatusRequest build() throws ConstraintViolationException { diff --git a/src/main/java/com/safecharge/request/GetSessionTokenRequest.java b/src/main/java/com/nuvei/request/GetSessionTokenRequest.java similarity index 60% rename from src/main/java/com/safecharge/request/GetSessionTokenRequest.java rename to src/main/java/com/nuvei/request/GetSessionTokenRequest.java index e43e09c..d5a0c57 100644 --- a/src/main/java/com/safecharge/request/GetSessionTokenRequest.java +++ b/src/main/java/com/nuvei/request/GetSessionTokenRequest.java @@ -1,30 +1,30 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

* Request to obtain a session token. *

- * This request returns a unique session token. Almost all Safecharge's requests require a valid session token. + * This request returns a unique session token. Almost all Nuvei's requests require a valid session token. * The unique token is created upon the initial successful authorization and represents the client session. * It also contains an expiration date, as well as information about user granted privileges. * For subsequent calls to the session, the token must be provided for validation to ensure that it is still active and valid. *

* Note that most of the payment requests consume the token, so it can be used for one payment only. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class GetSessionTokenRequest extends SafechargeRequest { +public class GetSessionTokenRequest extends NuveiRequest { public static Builder builder() { return new Builder(); @@ -38,15 +38,15 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { return ValidationUtils.validate(super.build(new GetSessionTokenRequest())); } } diff --git a/src/main/java/com/safecharge/request/GetSubscriptionPlansRequest.java b/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java similarity index 53% rename from src/main/java/com/safecharge/request/GetSubscriptionPlansRequest.java rename to src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java index dec0bfd..f7db6d1 100644 --- a/src/main/java/com/safecharge/request/GetSubscriptionPlansRequest.java +++ b/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

* Request to obtain available subscription plans for the merchant. - * Creating and updating subscription plans is possible using CPanel, SafeCharge’s back-office tool. + * Creating and updating subscription plans is possible using CPanel, Nuvei’s back-office tool. *

- * For more information, please contact SafeCharge’s Integration Team at integration@safecharge.com + * For more information, please contact Nuvei’s Integration Team at integration@nuvei.com * - * @author Nikola Dichev + * @author Nikola Dichev * @see CreateSubscriptionRequest * @see GetSubscriptionsListRequest * @see CancelSubscriptionRequest @@ -24,7 +24,7 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.GET_CASHIER_SUBSCRIPTIONS) public class GetSubscriptionPlansRequest - extends SafechargeRequest { + extends NuveiRequest { public static Builder builder() { return new Builder(); @@ -38,15 +38,15 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { return ValidationUtils.validate(super.build(new GetSubscriptionPlansRequest())); } } diff --git a/src/main/java/com/safecharge/request/GetSubscriptionsListRequest.java b/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java similarity index 87% rename from src/main/java/com/safecharge/request/GetSubscriptionsListRequest.java rename to src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java index b4f6fd0..7d10f0a 100644 --- a/src/main/java/com/safecharge/request/GetSubscriptionsListRequest.java +++ b/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -18,7 +18,7 @@ *

* The results can be filtered by the input params. * - * @author Nikola Dichev + * @author Nikola Dichev * @see CreateSubscriptionRequest * @see CancelSubscriptionRequest * @see GetSubscriptionPlansRequest @@ -26,7 +26,7 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.GET_CASHIER_SUBSCRIPTIONS) public class GetSubscriptionsListRequest - extends SafechargeRequest { + extends NuveiRequest { /** * The firstResult is a record number from which the subset starts. @@ -85,7 +85,7 @@ public void setUserTokenId(String userTokenId) { this.userTokenId = userTokenId; } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private int firstResult = 0; private int maxResults = 0; @@ -119,7 +119,7 @@ public GetSubscriptionsListRequest.Builder addMaxResults(int maxResults) { * subscription status. *

* Possible values are: INITIALIZING, ACTIVE, INACTIVE, CANCELED, but for the most up-to-date list of possible - * values check the API documentation. + * values check the API documentation. * * @param subscriptionStatus a {@link String} value representing a possible subscription status * @return this object @@ -162,11 +162,11 @@ public String toString() { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { GetSubscriptionsListRequest getSubscriptionListRequest = new GetSubscriptionsListRequest(); getSubscriptionListRequest.setFirstResult(firstResult); getSubscriptionListRequest.setMaxResults(maxResults); diff --git a/src/main/java/com/safecharge/request/GetUserDetailsRequest.java b/src/main/java/com/nuvei/request/GetUserDetailsRequest.java similarity index 67% rename from src/main/java/com/safecharge/request/GetUserDetailsRequest.java rename to src/main/java/com/nuvei/request/GetUserDetailsRequest.java index 4e67448..2b66cd1 100644 --- a/src/main/java/com/safecharge/request/GetUserDetailsRequest.java +++ b/src/main/java/com/nuvei/request/GetUserDetailsRequest.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.GET_CASHIER_USER_INFO) -public class GetUserDetailsRequest extends SafechargeRequest { +public class GetUserDetailsRequest extends NuveiRequest { @NotNull @Size(max = 255) @@ -31,7 +31,7 @@ public void setUserTokenId(String userTokenId) { this.userTokenId = userTokenId; } - public static class Builder> extends SafechargeBuilder { + public static class Builder> extends NuveiBuilder { protected String userTokenId; diff --git a/src/main/java/com/safecharge/request/GetUserUPOsRequest.java b/src/main/java/com/nuvei/request/GetUserUPOsRequest.java similarity index 69% rename from src/main/java/com/safecharge/request/GetUserUPOsRequest.java rename to src/main/java/com/nuvei/request/GetUserUPOsRequest.java index adb1edd..1789ec2 100644 --- a/src/main/java/com/safecharge/request/GetUserUPOsRequest.java +++ b/src/main/java/com/nuvei/request/GetUserUPOsRequest.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -19,11 +19,11 @@ * Enables receiving specific order details of an existing order. * Note that order details can be viewed at any point in time. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 1/29/2018 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.GET_CASHIER_USER_INFO) -public class GetUserUPOsRequest extends SafechargeRequest { +public class GetUserUPOsRequest extends NuveiRequest { @NotNull @Size(max = 255) @@ -41,7 +41,7 @@ public void setUserTokenId(String userTokenId) { this.userTokenId = userTokenId; } - public static class Builder> extends SafechargeBuilder { + public static class Builder> extends NuveiBuilder { protected String userTokenId; diff --git a/src/main/java/com/safecharge/request/InitPaymentRequest.java b/src/main/java/com/nuvei/request/InitPaymentRequest.java similarity index 94% rename from src/main/java/com/safecharge/request/InitPaymentRequest.java rename to src/main/java/com/nuvei/request/InitPaymentRequest.java index dea7c66..824d62c 100644 --- a/src/main/java/com/safecharge/request/InitPaymentRequest.java +++ b/src/main/java/com/nuvei/request/InitPaymentRequest.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.*; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.*; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -20,7 +20,7 @@ *

*/ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class InitPaymentRequest extends SafechargeRequest { +public class InitPaymentRequest extends NuveiRequest { @Size(max = 255, message = "userTokenId size must be up to 255 characters long!") private String userTokenId; @@ -179,7 +179,7 @@ public static Builder builder() { return new Builder(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String clientUniqueId; diff --git a/src/main/java/com/safecharge/request/McpRatesRequest.java b/src/main/java/com/nuvei/request/McpRatesRequest.java similarity index 89% rename from src/main/java/com/safecharge/request/McpRatesRequest.java rename to src/main/java/com/nuvei/request/McpRatesRequest.java index c207d36..84e3023 100644 --- a/src/main/java/com/safecharge/request/McpRatesRequest.java +++ b/src/main/java/com/nuvei/request/McpRatesRequest.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import java.util.ArrayList; import java.util.List; @@ -13,13 +13,13 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class McpRatesRequest extends SafechargeRequest { +public class McpRatesRequest extends NuveiRequest { @Size(max = 45) private String clientUniqueId; @@ -86,7 +86,7 @@ public static Builder builder() { return new Builder(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String clientUniqueId; private String fromCurrency; diff --git a/src/main/java/com/safecharge/request/SafechargeBaseRequest.java b/src/main/java/com/nuvei/request/NuveiBaseRequest.java similarity index 86% rename from src/main/java/com/safecharge/request/SafechargeBaseRequest.java rename to src/main/java/com/nuvei/request/NuveiBaseRequest.java index 9a6002b..0a4c8ba 100644 --- a/src/main/java/com/safecharge/request/SafechargeBaseRequest.java +++ b/src/main/java/com/nuvei/request/NuveiBaseRequest.java @@ -1,21 +1,21 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.NotNull; -import com.safecharge.util.APIConstants; +import com.nuvei.util.APIConstants; /** *

- * Abstract class to be used as a base for all of the requests to SafeCharge's servers. + * Abstract class to be used as a base for all of the requests to Nuvei's servers. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ -public abstract class SafechargeBaseRequest { +public abstract class NuveiBaseRequest { /** * Merchant's unique request ID @@ -47,8 +47,8 @@ public abstract class SafechargeBaseRequest { private String serverHost; - private final String webMasterId = SafechargeBaseRequest.class.getPackage().getImplementationVersion() != null - ? APIConstants.SDK_JAVA_VERSION.concat(SafechargeBaseRequest.class.getPackage().getImplementationVersion()) : null; + private final String webMasterId = NuveiBaseRequest.class.getPackage().getImplementationVersion() != null + ? APIConstants.SDK_JAVA_VERSION.concat(NuveiBaseRequest.class.getPackage().getImplementationVersion()) : null; private final String sourceApplication = "JAVA_SDK"; diff --git a/src/main/java/com/safecharge/request/SafechargeCCRequest.java b/src/main/java/com/nuvei/request/NuveiCCRequest.java similarity index 86% rename from src/main/java/com/safecharge/request/SafechargeCCRequest.java rename to src/main/java/com/nuvei/request/NuveiCCRequest.java index 346615f..50012a5 100644 --- a/src/main/java/com/safecharge/request/SafechargeCCRequest.java +++ b/src/main/java/com/nuvei/request/NuveiCCRequest.java @@ -1,30 +1,30 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.Size; -import com.safecharge.model.CardData; -import com.safecharge.model.ExternalMpi; -import com.safecharge.model.ExternalSchemeDetails; -import com.safecharge.model.ExternalTokenProvider; -import com.safecharge.model.StoredCredentials; -import com.safecharge.model.UserPaymentOption; +import com.nuvei.model.CardData; +import com.nuvei.model.ExternalMpi; +import com.nuvei.model.ExternalSchemeDetails; +import com.nuvei.model.ExternalTokenProvider; +import com.nuvei.model.StoredCredentials; +import com.nuvei.model.UserPaymentOption; /** *

* Abstract class to be used as a base for credit card payment requests. *

* - * @author Nikola Dichev + * @author Nikola Dichev * @since 4/10/2017 */ -public abstract class SafechargeCCRequest extends SafechargePaymentRequest implements SafechargeOrderRequest { +public abstract class NuveiCCRequest extends NuveiPaymentRequest implements NuveiOrderRequest { /** * MerchantOrderID to be used as input parameter in update method and payment methods. The parameter passed to define which merchant order to update. @@ -55,7 +55,7 @@ public abstract class SafechargeCCRequest extends SafechargePaymentRequest imple * User payment option can to be provided as an alternative for providing card data/card token/Apple Pay token. * Only one of them can be in use for a certain transaction. If both not provided or both provided it will cause an error. *

- * SafeCharge decide per client in gateway and per site in Checkout Page, weather CVV is mandatory to be provided with a UPO. + * Nuvei decide per client in gateway and per site in Checkout Page, weather CVV is mandatory to be provided with a UPO. * Sending CVV will gain a getter interchange. if neded it will be sent by the merchant in cardData class, cvv parameter. *

*/ @@ -163,7 +163,7 @@ public void setExternalSchemeDetails(ExternalSchemeDetails externalSchemeDetails @Override public String toString() { - final StringBuilder sb = new StringBuilder("SafechargeCCRequest{"); + final StringBuilder sb = new StringBuilder("NuveiCCRequest{"); sb.append(super.toString()); sb.append("orderId='").append(orderId).append('\''); sb.append(", cardData=").append(cardData); diff --git a/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java b/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java similarity index 92% rename from src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java rename to src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java index 60f3951..1c5025d 100644 --- a/src/main/java/com/safecharge/request/SafechargeOrderDetailsRequest.java +++ b/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import java.util.ArrayList; import java.util.List; @@ -11,16 +11,16 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.Addendums; -import com.safecharge.model.AmountDetails; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.Item; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.ShippingTrackingDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserAddress; +import com.nuvei.model.Addendums; +import com.nuvei.model.AmountDetails; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.ShippingTrackingDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserAddress; /** *

@@ -29,7 +29,7 @@ * @author Nikola Dichev * @since 2/15/2017 */ -public abstract class SafechargeOrderDetailsRequest extends SafechargeRequest { +public abstract class NuveiOrderDetailsRequest extends NuveiRequest { /** * The three character ISO currency code. diff --git a/src/main/java/com/safecharge/request/SafechargeOrderRequest.java b/src/main/java/com/nuvei/request/NuveiOrderRequest.java similarity index 71% rename from src/main/java/com/safecharge/request/SafechargeOrderRequest.java rename to src/main/java/com/nuvei/request/NuveiOrderRequest.java index df216f4..701608d 100644 --- a/src/main/java/com/safecharge/request/SafechargeOrderRequest.java +++ b/src/main/java/com/nuvei/request/NuveiOrderRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; /** *

@@ -10,10 +10,10 @@ *

* The reason is that merchant order id is required param to work with an already created order. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/22/2017 */ -public interface SafechargeOrderRequest { +public interface NuveiOrderRequest { /** * MerchantOrderID to be used as input parameter in update request and payment requests. diff --git a/src/main/java/com/safecharge/request/SafechargePaymentRequest.java b/src/main/java/com/nuvei/request/NuveiPaymentRequest.java similarity index 89% rename from src/main/java/com/safecharge/request/SafechargePaymentRequest.java rename to src/main/java/com/nuvei/request/NuveiPaymentRequest.java index 1156ae0..c38fa63 100644 --- a/src/main/java/com/safecharge/request/SafechargePaymentRequest.java +++ b/src/main/java/com/nuvei/request/NuveiPaymentRequest.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.util.Constants; +import com.nuvei.util.Constants; import javax.validation.constraints.Size; -public abstract class SafechargePaymentRequest extends SafechargeOrderDetailsRequest { +public abstract class NuveiPaymentRequest extends NuveiOrderDetailsRequest { /** * Transaction Type of the request. Possible values: Auth / Sale. diff --git a/src/main/java/com/safecharge/request/SafechargeRequest.java b/src/main/java/com/nuvei/request/NuveiRequest.java similarity index 76% rename from src/main/java/com/safecharge/request/SafechargeRequest.java rename to src/main/java/com/nuvei/request/NuveiRequest.java index b9286ec..9d7053b 100644 --- a/src/main/java/com/safecharge/request/SafechargeRequest.java +++ b/src/main/java/com/nuvei/request/NuveiRequest.java @@ -1,28 +1,28 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.NotNull; /** *

- * Abstract class to be used as a base for all of the requests to SafeCharge's servers. + * Abstract class to be used as a base for all of the requests to Nuvei's servers. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ -public abstract class SafechargeRequest extends SafechargeBaseRequest { +public abstract class NuveiRequest extends NuveiBaseRequest { /** - * Merchant ID provided by SafeCharge. + * Merchant ID provided by Nuvei. */ @NotNull(message = "merchantId parameter is mandatory!") private String merchantId; /** - * Merchant Site ID provided by SafeCharge. + * Merchant Site ID provided by Nuvei. */ @NotNull(message = "merchantSiteId parameter is mandatory!") private String merchantSiteId; diff --git a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java similarity index 90% rename from src/main/java/com/safecharge/request/SafechargeTransactionRequest.java rename to src/main/java/com/nuvei/request/NuveiTransactionRequest.java index c00203b..81ed750 100644 --- a/src/main/java/com/safecharge/request/SafechargeTransactionRequest.java +++ b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java @@ -1,26 +1,26 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.CompanyDetails; -import com.safecharge.model.ShippingTrackingDetails; -import com.safecharge.model.SubMerchant; -import com.safecharge.model.UrlDetails; +import com.nuvei.model.CompanyDetails; +import com.nuvei.model.ShippingTrackingDetails; +import com.nuvei.model.SubMerchant; +import com.nuvei.model.UrlDetails; /** *

* Abstract class to be used as a base for transaction related requests. *

- * @author Nikola Dichev + * @author Nikola Dichev * @since 3/22/2017 */ -public abstract class SafechargeTransactionRequest extends SafechargeRequest { +public abstract class NuveiTransactionRequest extends NuveiRequest { /** * The transaction amount. (E.g. 1, 101.10 - decimal representation of the amount as {@link String}) @@ -177,7 +177,7 @@ public void setShippingTrackingDetails(ShippingTrackingDetails shippingTrackingD @Override public String toString() { - final StringBuilder sb = new StringBuilder("SafechargeTransactionRequest{"); + final StringBuilder sb = new StringBuilder("NuveiTransactionRequest{"); sb.append("amount='").append(amount).append('\''); sb.append(", currency='").append(currency).append('\''); sb.append(", authCode='").append(authCode).append('\''); diff --git a/src/main/java/com/safecharge/request/OpenOrderRequest.java b/src/main/java/com/nuvei/request/OpenOrderRequest.java similarity index 92% rename from src/main/java/com/safecharge/request/OpenOrderRequest.java rename to src/main/java/com/nuvei/request/OpenOrderRequest.java index 53535ea..72f70c8 100644 --- a/src/main/java/com/safecharge/request/OpenOrderRequest.java +++ b/src/main/java/com/nuvei/request/OpenOrderRequest.java @@ -1,26 +1,26 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.model.*; -import com.safecharge.request.builder.SafechargeOrderWithDetailsBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.*; +import com.nuvei.request.builder.NuveiOrderWithDetailsBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

- * Request to create an order in the SafeCharge's system. + * Request to create an order in the Nuvei's system. *

* This request represents the state of the order when it is created, it can be changed at later time. * Note that no payment request is send, it is used mainly to store the order details at the time of creation. * - * @author Nikola Dichev + * @author Nikola Dichev * @see GetOrderDetailsRequest * @see UpdateOrderRequest * @since 2/15/2017 @@ -168,7 +168,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeOrderWithDetailsBuilder { + public static class Builder extends NuveiOrderWithDetailsBuilder { private String customSiteName; private String productId; @@ -270,10 +270,10 @@ public Builder addCompanyDetails(CompanyDetails companyDetails) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { OpenOrderRequest request = new OpenOrderRequest(); request.setCustomSiteName(customSiteName); request.setProductId(productId); diff --git a/src/main/java/com/safecharge/request/OrderRequestWithDetails.java b/src/main/java/com/nuvei/request/OrderRequestWithDetails.java similarity index 89% rename from src/main/java/com/safecharge/request/OrderRequestWithDetails.java rename to src/main/java/com/nuvei/request/OrderRequestWithDetails.java index 07c32bf..f52c611 100644 --- a/src/main/java/com/safecharge/request/OrderRequestWithDetails.java +++ b/src/main/java/com/nuvei/request/OrderRequestWithDetails.java @@ -1,32 +1,32 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.model.CurrencyConversion; -import com.safecharge.model.ExternalSchemeDetails; -import com.safecharge.model.OpenAmount; -import com.safecharge.model.UserPaymentOption; +import com.nuvei.model.CurrencyConversion; +import com.nuvei.model.ExternalSchemeDetails; +import com.nuvei.model.OpenAmount; +import com.nuvei.model.UserPaymentOption; /** *

- * Abstract class with basic fields used with requests to create an order in the SafeCharge's system. + * Abstract class with basic fields used with requests to create an order in the Nuvei's system. *

*

* This request represents the state of the order when it is created, it can be changed at later time. * Note that no payment request is send, it is used mainly to store the order details at the time of creation. *

* - * @author Vassil Nikov + * @author Vassil Nikov * @see GetOrderDetailsRequest * @see UpdateOrderRequest * @see OpenOrderRequest */ -public abstract class OrderRequestWithDetails extends SafechargeOrderDetailsRequest { +public abstract class OrderRequestWithDetails extends NuveiOrderDetailsRequest { @Size(max = 50) private String paymentMethod; diff --git a/src/main/java/com/safecharge/request/Payment3DRequest.java b/src/main/java/com/nuvei/request/Payment3DRequest.java similarity index 79% rename from src/main/java/com/safecharge/request/Payment3DRequest.java rename to src/main/java/com/nuvei/request/Payment3DRequest.java index f42efbc..548ae2a 100644 --- a/src/main/java/com/safecharge/request/Payment3DRequest.java +++ b/src/main/java/com/nuvei/request/Payment3DRequest.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.builder.SafechargeCCBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiCCBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -20,7 +20,7 @@ * When 3DSecure is implemented into the payment process, disputed transactions and chargebacks are reduced by shifting * the liability of the charge from the merchant to the cardholder. * - * @author Nikola Dichev + * @author Nikola Dichev * @see Authorization3DRequest * @see PaymentAPMRequest * @see PaymentCCRequest @@ -28,7 +28,7 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class Payment3DRequest - extends SafechargeCCRequest { + extends NuveiCCRequest { /** * The payment authorization response returned by the card issuer/bank. @@ -58,7 +58,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeCCBuilder { + public static class Builder extends NuveiCCBuilder { private String paResponse; @@ -76,10 +76,10 @@ public Builder addPaResponse(String paResponse) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { Payment3DRequest request = new Payment3DRequest(); request.setPaResponse(paResponse); return ValidationUtils.validate(super.build(request)); diff --git a/src/main/java/com/safecharge/request/PaymentAPMRequest.java b/src/main/java/com/nuvei/request/PaymentAPMRequest.java similarity index 81% rename from src/main/java/com/safecharge/request/PaymentAPMRequest.java rename to src/main/java/com/nuvei/request/PaymentAPMRequest.java index 9d82dda..3e41c00 100644 --- a/src/main/java/com/safecharge/request/PaymentAPMRequest.java +++ b/src/main/java/com/nuvei/request/PaymentAPMRequest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import java.util.Map; @@ -10,12 +10,12 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.SubMethodDetails; -import com.safecharge.model.UserPaymentOption; -import com.safecharge.request.builder.SafechargeOrderBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.SubMethodDetails; +import com.nuvei.model.UserPaymentOption; +import com.nuvei.request.builder.NuveiOrderBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -23,24 +23,24 @@ *

* PaymentAPM transaction is implemented in four main stages: *

    - *
  1. Ensuring that SafeCharge is integrated to the desired APM.
    2. + *
  2. Ensuring that Nuvei is integrated to the desired APM.
    3. *
  3. The {@code paymentAPM} request.
    4. *
  4. The required merchant actions (for APM’s who use redirect).
    5. * Following a positive response from the paymentAPM request, per output parameter {@code transactionStatus} returned value, * the merchant is redirected to the APM’s payment page (using {@code redirectUrl}) to login and confirm the billing information. *
  5. The APM required actions (for APM’s who use redirect). Once the credentials are typed and the payment is confirmed, - * the APM redirects (with some additional information) back to SafeCharge’s gateway using a {@code returnUrl} from previous APM-SafeCharge - * communications at 1st stage. Afterwards, the SafeCharge gateway redirects to a {@code successURL} or to a {@code failureURL}.
    6. + * the APM redirects (with some additional information) back to Nuvei’s gateway using a {@code returnUrl} from previous APM-Nuvei + * communications at 1st stage. Afterwards, the Nuvei gateway redirects to a {@code successURL} or to a {@code failureURL}. *
* - * @author Nikola Dichev + * @author Nikola Dichev * @see Payment3DRequest * @see PaymentCCRequest * @since 2/15/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class PaymentAPMRequest - extends SafechargeOrderDetailsRequest implements SafechargeOrderRequest { + extends NuveiOrderDetailsRequest implements NuveiOrderRequest { /** * MerchantOrderID to be used as input parameter in update method and payment methods. The parameter passed to define which merchant order to update. @@ -137,7 +137,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeOrderBuilder { + public static class Builder extends NuveiOrderBuilder { private String orderId; private String paymentMethod; @@ -160,8 +160,8 @@ public Builder addOrderId(String orderId) { /** * Adds the payment method name to the request. * - * @param paymentMethod SafeCharge’s unique name of the payment method. For a list of possible payment methods check - * APM Unique SafeCharge Names. + * @param paymentMethod Nuvei’s unique name of the payment method. For a list of possible payment methods check + * APM Unique Nuvei Names. * @return this object */ public Builder addPaymentMethod(String paymentMethod) { @@ -170,10 +170,10 @@ public Builder addPaymentMethod(String paymentMethod) { } /** - * Adds user account details to the request. Those details are related to the user's APM account and not the SafeCharge's account. + * Adds user account details to the request. Those details are related to the user's APM account and not the Nuvei's account. * - * @param userAccountDetails SafeCharge’s account identifiers of the payment method's details. For more information, see - * APM Account Identifiers. + * @param userAccountDetails Nuvei’s account identifiers of the payment method's details. For more information, see + * APM Account Identifiers. * @return this object */ public Builder addUserAccountDetails(Map userAccountDetails) { @@ -184,9 +184,9 @@ public Builder addUserAccountDetails(Map userAccountDetails) { /** * Adds User Payment Option (UPO) ID to the request. *

- * This is the ID of previously used payment option (PO) stored in the SafeCharge's system. + * This is the ID of previously used payment option (PO) stored in the Nuvei's system. * - * @param userPaymentOptionId The id of a previously used PO(that the user has agreed to store in SafeCharge's system) + * @param userPaymentOptionId The id of a previously used PO(that the user has agreed to store in Nuvei's system) * @param cvv Card Verification Value number. If the UPO requires CVV for every transaction, it must be provided * @return this object */ @@ -226,10 +226,10 @@ public Builder addCustomData(String customData) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { PaymentAPMRequest paymentAPMRequest = new PaymentAPMRequest(); paymentAPMRequest.setOrderId(orderId); paymentAPMRequest.setPaymentMethod(paymentMethod); diff --git a/src/main/java/com/safecharge/request/PaymentCCRequest.java b/src/main/java/com/nuvei/request/PaymentCCRequest.java similarity index 60% rename from src/main/java/com/safecharge/request/PaymentCCRequest.java rename to src/main/java/com/nuvei/request/PaymentCCRequest.java index 2d297be..4cafb78 100644 --- a/src/main/java/com/safecharge/request/PaymentCCRequest.java +++ b/src/main/java/com/nuvei/request/PaymentCCRequest.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.builder.SafechargeCCBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiCCBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -16,17 +16,17 @@ * The request must contain only one of the three: *

    *
  1. CardData(such as card number, cardholder name, CVV, expiration date) - *
  2. User Payment Option ID of previouslt used credit/debit card, which info is stored by the SafeCharge's system. + *
  3. User Payment Option ID of previouslt used credit/debit card, which info is stored by the Nuvei's system. *
  4. Temporary card token. *
* - * @author Nikola Dichev + * @author Nikola Dichev * @see Payment3DRequest * @see PaymentAPMRequest * @since 2/15/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class PaymentCCRequest extends SafechargeCCRequest { +public class PaymentCCRequest extends NuveiCCRequest { public static Builder builder() { return new Builder(); @@ -40,15 +40,15 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeCCBuilder { + public static class Builder extends NuveiCCBuilder { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { PaymentCCRequest request = new PaymentCCRequest(); return ValidationUtils.validate(super.build(request)); } diff --git a/src/main/java/com/safecharge/request/PaymentRequest.java b/src/main/java/com/nuvei/request/PaymentRequest.java similarity index 89% rename from src/main/java/com/safecharge/request/PaymentRequest.java rename to src/main/java/com/nuvei/request/PaymentRequest.java index 5c70f6a..245537d 100644 --- a/src/main/java/com/safecharge/request/PaymentRequest.java +++ b/src/main/java/com/nuvei/request/PaymentRequest.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

* Uniform request to perform card transactions(credit or debit) * It supports 3D Secure and alternative payment method transactions. *

- * see Payment + * see Payment */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class PaymentRequest extends Authorize3dAndPaymentRequest { diff --git a/src/main/java/com/safecharge/request/PayoutRequest.java b/src/main/java/com/nuvei/request/PayoutRequest.java similarity index 91% rename from src/main/java/com/safecharge/request/PayoutRequest.java rename to src/main/java/com/nuvei/request/PayoutRequest.java index b062d93..025a352 100644 --- a/src/main/java/com/safecharge/request/PayoutRequest.java +++ b/src/main/java/com/nuvei/request/PayoutRequest.java @@ -1,26 +1,26 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.model.CardData; -import com.safecharge.model.CompanyDetails; -import com.safecharge.model.CurrencyConversion; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.SubMethodDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserDetails; -import com.safecharge.model.UserPaymentOption; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.CardData; +import com.nuvei.model.CompanyDetails; +import com.nuvei.model.CurrencyConversion; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.SubMethodDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserDetails; +import com.nuvei.model.UserPaymentOption; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -32,16 +32,16 @@ * However, they are able to use this {@link PayoutRequest} directly. *

* Merchants are able to use the payout client SDK, according to the instructions < - * here + * here * which performs credit card tokenization for them. * * @author Bozhidar Shumanov - * @see payout + * @see payout * @since 11/21/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class PayoutRequest extends SafechargeRequest { +public class PayoutRequest extends NuveiRequest { @Size(max = 255) private String userTokenId; @@ -234,7 +234,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String clientUniqueId; diff --git a/src/main/java/com/safecharge/request/RefundTransactionRequest.java b/src/main/java/com/nuvei/request/RefundTransactionRequest.java similarity index 84% rename from src/main/java/com/safecharge/request/RefundTransactionRequest.java rename to src/main/java/com/nuvei/request/RefundTransactionRequest.java index 05fbf63..f00909b 100644 --- a/src/main/java/com/safecharge/request/RefundTransactionRequest.java +++ b/src/main/java/com/nuvei/request/RefundTransactionRequest.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.Size; -import com.safecharge.model.RefundPaymentOption; -import com.safecharge.request.builder.SafechargeTransactionBuilder; -import com.safecharge.util.AtLeastOneFieldPresent; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiTransactionBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; +import com.nuvei.model.RefundPaymentOption; +import com.nuvei.util.AtLeastOneFieldPresent; /** *

@@ -23,7 +23,7 @@ * When partial refunds are issued, multiple refund requests can be performed for up to the entire amount * of the original settled transaction. * - * @author Nikola Dichev + * @author Nikola Dichev * @see SettleTransactionRequest * @see VoidTransactionRequest * @since 3/20/2017 @@ -32,7 +32,7 @@ @AtLeastOneFieldPresent(fields = { "paymentOption", "relatedTransactionId" }, message = "Either \"paymentOption\" or \"relatedTransactionId\" must be defined") public class RefundTransactionRequest - extends SafechargeTransactionRequest { + extends NuveiTransactionRequest { public static Builder builder() { return new Builder(); @@ -91,7 +91,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeTransactionBuilder { + public static class Builder extends NuveiTransactionBuilder { private RefundPaymentOption refundPaymentOption; private String userTokenId; @@ -128,11 +128,11 @@ public Builder addRelatedTransactionId(String relatedTransactionId) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { RefundTransactionRequest refundTransactionRequest = new RefundTransactionRequest(); refundTransactionRequest.setPaymentOption(refundPaymentOption); refundTransactionRequest.setUserTokenId(userTokenId); diff --git a/src/main/java/com/safecharge/request/SettleTransactionRequest.java b/src/main/java/com/nuvei/request/SettleTransactionRequest.java similarity index 88% rename from src/main/java/com/safecharge/request/SettleTransactionRequest.java rename to src/main/java/com/nuvei/request/SettleTransactionRequest.java index bb399fd..a3cd323 100644 --- a/src/main/java/com/safecharge/request/SettleTransactionRequest.java +++ b/src/main/java/com/nuvei/request/SettleTransactionRequest.java @@ -1,21 +1,21 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.Addendums; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.ShippingTrackingDetails; -import com.safecharge.request.builder.SafechargeTransactionBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.Addendums; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.ShippingTrackingDetails; +import com.nuvei.request.builder.NuveiTransactionBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -25,14 +25,14 @@ * auth-settle process, for either a full or partial settles. When partial settles are issued – multiple settle requests * can be performed for up to the entire amount of the original authorized transaction. * - * @author Nikola Dichev + * @author Nikola Dichev * @see RefundTransactionRequest * @see VoidTransactionRequest * @since 3/20/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.SETTLE_GW_TRANSACTION) public class SettleTransactionRequest - extends SafechargeTransactionRequest { + extends NuveiTransactionRequest { @Size(max = 25, message = "descriptorMerchantName size must be up to 25 characters long!") private String descriptorMerchantName; @@ -105,7 +105,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeTransactionBuilder { + public static class Builder extends NuveiTransactionBuilder { private String descriptorMerchantName; private String descriptorMerchantPhone; @@ -177,11 +177,11 @@ public Builder addRelatedTransactionId(String relatedTransactionId) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { SettleTransactionRequest settleTransactionRequest = new SettleTransactionRequest(); settleTransactionRequest.setDescriptorMerchantName(descriptorMerchantName); settleTransactionRequest.setDescriptorMerchantPhone(descriptorMerchantPhone); diff --git a/src/main/java/com/safecharge/request/SuspendUPORequest.java b/src/main/java/com/nuvei/request/SuspendUPORequest.java similarity index 60% rename from src/main/java/com/safecharge/request/SuspendUPORequest.java rename to src/main/java/com/nuvei/request/SuspendUPORequest.java index 5369731..2568406 100644 --- a/src/main/java/com/safecharge/request/SuspendUPORequest.java +++ b/src/main/java/com/nuvei/request/SuspendUPORequest.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.SUSPEND_UPO) public class SuspendUPORequest extends EditUPOBasicRequest { @@ -21,7 +21,7 @@ public static Builder builder() { public static class Builder extends EditUPOBasicRequest.Builder { @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { SuspendUPORequest suspendUPORequest = new SuspendUPORequest(); return ValidationUtils.validate(super.build(suspendUPORequest)); } diff --git a/src/main/java/com/safecharge/request/UpdateOrderRequest.java b/src/main/java/com/nuvei/request/UpdateOrderRequest.java similarity index 67% rename from src/main/java/com/safecharge/request/UpdateOrderRequest.java rename to src/main/java/com/nuvei/request/UpdateOrderRequest.java index 4a8bc0e..3e1dcb4 100644 --- a/src/main/java/com/safecharge/request/UpdateOrderRequest.java +++ b/src/main/java/com/nuvei/request/UpdateOrderRequest.java @@ -1,25 +1,25 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeOrderBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiOrderBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @see GetOrderDetailsRequest * @see OpenOrderRequest * @since 2/17/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class UpdateOrderRequest extends SafechargeOrderDetailsRequest implements SafechargeOrderRequest { +public class UpdateOrderRequest extends NuveiOrderDetailsRequest implements NuveiOrderRequest { @Size(max = 45, message = "orderId size must be up to 45 characters long!") private String orderId; @@ -49,7 +49,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeOrderBuilder { + public static class Builder extends NuveiOrderBuilder { private String orderId; @@ -61,10 +61,10 @@ public Builder addOrderId(String orderId) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder */ @Override - public SafechargeBaseRequest build() { + public NuveiBaseRequest build() { UpdateOrderRequest updateOrderRequest = new UpdateOrderRequest(); updateOrderRequest.setOrderId(orderId); return ValidationUtils.validate(super.build(updateOrderRequest)); diff --git a/src/main/java/com/safecharge/request/UpdateUserRequest.java b/src/main/java/com/nuvei/request/UpdateUserRequest.java similarity index 53% rename from src/main/java/com/safecharge/request/UpdateUserRequest.java rename to src/main/java/com/nuvei/request/UpdateUserRequest.java index 532eada..c6b2812 100644 --- a/src/main/java/com/safecharge/request/UpdateUserRequest.java +++ b/src/main/java/com/nuvei/request/UpdateUserRequest.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; -import com.safecharge.request.basic.CashierUserRequest; -import com.safecharge.request.builder.SafechargeCashierUserBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.basic.CashierUserRequest; +import com.nuvei.request.builder.NuveiCashierUserBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.MODIFY_CASHIER_USER) public class UpdateUserRequest extends CashierUserRequest { @@ -17,7 +17,7 @@ public static UpdateUserRequest.Builder builder() { return new UpdateUserRequest.Builder(); } - public static class Builder extends SafechargeCashierUserBuilder { + public static class Builder extends NuveiCashierUserBuilder { public UpdateUserRequest build() { UpdateUserRequest request = new UpdateUserRequest(); diff --git a/src/main/java/com/safecharge/request/Verify3dRequest.java b/src/main/java/com/nuvei/request/Verify3dRequest.java similarity index 86% rename from src/main/java/com/safecharge/request/Verify3dRequest.java rename to src/main/java/com/nuvei/request/Verify3dRequest.java index 3c9051e..07b4f05 100644 --- a/src/main/java/com/safecharge/request/Verify3dRequest.java +++ b/src/main/java/com/nuvei/request/Verify3dRequest.java @@ -1,39 +1,36 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; - -import java.util.Date; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.SubMerchant; -import com.safecharge.model.UserAddress; -import com.safecharge.model.Verify3dPaymentOption; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.request.builder.SafechargePaymentBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.SubMerchant; +import com.nuvei.model.UserAddress; +import com.nuvei.model.Verify3dPaymentOption; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

- * Use this request if you need the SafeCharge MPI service to perform a 3D Secure only request. This method is called + * Use this request if you need the Nuvei MPI service to perform a 3D Secure only request. This method is called * after the {@link Authorize3dRequest} method in case of the Challenge. *

* This method retrieves the generic 3D Secure result (ECI and CAVV) that you need to send to your PSP or acquirer to benefit - * from the 3D Secure liability shift received from the SafeCharge 3D Secure service. - * see Verify3d + * from the 3D Secure liability shift received from the Nuvei 3D Secure service. + * see Verify3d * * @since 6/29/2020 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class Verify3dRequest extends SafechargeRequest { +public class Verify3dRequest extends NuveiRequest { @Size(max = 255) private String userTokenId; @@ -182,7 +179,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String clientUniqueId; @@ -258,7 +255,7 @@ public Builder addSubMerchant(SubMerchant subMerchant) { } @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { Verify3dRequest verify3dRequest = new Verify3dRequest(); verify3dRequest.setAmount(amount); verify3dRequest.setBillingAddress(billingAddress); diff --git a/src/main/java/com/safecharge/request/VoidTransactionRequest.java b/src/main/java/com/nuvei/request/VoidTransactionRequest.java similarity index 83% rename from src/main/java/com/safecharge/request/VoidTransactionRequest.java rename to src/main/java/com/nuvei/request/VoidTransactionRequest.java index c562760..51f9d52 100644 --- a/src/main/java/com/safecharge/request/VoidTransactionRequest.java +++ b/src/main/java/com/nuvei/request/VoidTransactionRequest.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request; +package com.nuvei.request; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.builder.SafechargeTransactionBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.builder.NuveiTransactionBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidChecksum; +import com.nuvei.util.ValidationUtils; /** *

@@ -20,14 +20,14 @@ * This request is used for voiding a previously performed authorization, within a two-phase auth-settle process. * Please note that a void action is not always supported by the payment method or the card issuer. * - * @author Nikola Dichev + * @author Nikola Dichev * @see RefundTransactionRequest * @see SettleTransactionRequest * @since 3/20/2017 */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.VOID_GW_TRANSACTION) public class VoidTransactionRequest - extends SafechargeTransactionRequest { + extends NuveiTransactionRequest { /** * The ID of the original auth transaction. @@ -56,7 +56,7 @@ public String toString() { return sb.toString(); } - public static class Builder extends SafechargeTransactionBuilder { + public static class Builder extends NuveiTransactionBuilder { private String relatedTransactionId; diff --git a/src/main/java/com/safecharge/request/basic/CashierUserRequest.java b/src/main/java/com/nuvei/request/basic/CashierUserRequest.java similarity index 92% rename from src/main/java/com/safecharge/request/basic/CashierUserRequest.java rename to src/main/java/com/nuvei/request/basic/CashierUserRequest.java index e36d93b..1104a3d 100644 --- a/src/main/java/com/safecharge/request/basic/CashierUserRequest.java +++ b/src/main/java/com/nuvei/request/basic/CashierUserRequest.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.basic; +package com.nuvei.request.basic; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.safecharge.request.SafechargeRequest; +import com.nuvei.request.NuveiRequest; -public class CashierUserRequest extends SafechargeRequest { +public class CashierUserRequest extends NuveiRequest { @NotNull @Size(max = 255) diff --git a/src/main/java/com/safecharge/request/basic/EditUPOBasicRequest.java b/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java similarity index 78% rename from src/main/java/com/safecharge/request/basic/EditUPOBasicRequest.java rename to src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java index 080cfe9..3842ae4 100644 --- a/src/main/java/com/safecharge/request/basic/EditUPOBasicRequest.java +++ b/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java @@ -1,23 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.basic; +package com.nuvei.request.basic; import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; -import com.safecharge.request.DeleteUPORequest; -import com.safecharge.request.EditUPOAPMRequest; -import com.safecharge.request.EditUPOCreditCardRequest; -import com.safecharge.request.EnableUPORequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.SafechargeRequest; -import com.safecharge.request.SuspendUPORequest; -import com.safecharge.request.builder.SafechargeBuilder; -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; -import com.safecharge.util.ValidationUtils; +import com.nuvei.request.DeleteUPORequest; +import com.nuvei.request.EditUPOAPMRequest; +import com.nuvei.request.EditUPOCreditCardRequest; +import com.nuvei.request.EnableUPORequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.NuveiRequest; +import com.nuvei.request.SuspendUPORequest; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidationUtils; /** *

@@ -26,11 +25,11 @@ * This goal of this request is to add a credit card UPO for a specific user according to their User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 3/21/2017 */ -public class EditUPOBasicRequest extends SafechargeRequest { +public class EditUPOBasicRequest extends NuveiRequest { @NotNull(message = "userPaymentOptionId parameter is mandatory!") private String userPaymentOptionId; @@ -90,7 +89,7 @@ public String toString() { return sb.toString(); } - public static class Builder> extends SafechargeBuilder { + public static class Builder> extends NuveiBuilder { private String userTokenId; private String userPaymentOptionId; @@ -120,7 +119,7 @@ public T addUserPaymentOptionId(String userPaymentOptionId) { /** * Builds the request. * - * @return {@link SafechargeRequest} object build from the params set by this builder + * @return {@link NuveiRequest} object build from the params set by this builder * @throws ConstraintViolationException if the validation of the params fails */ protected EditUPOBasicRequest build(EditUPOBasicRequest editUPOBasicRequest) throws ConstraintViolationException { @@ -130,7 +129,7 @@ protected EditUPOBasicRequest build(EditUPOBasicRequest editUPOBasicRequest) thr } @Override - public SafechargeBaseRequest build() throws ConstraintViolationException { + public NuveiBaseRequest build() throws ConstraintViolationException { EditUPOBasicRequest editUPOBasicRequest = new EditUPOBasicRequest(); editUPOBasicRequest.setUserTokenId(userTokenId); editUPOBasicRequest.setUserPaymentOptionId(userPaymentOptionId); diff --git a/src/main/java/com/safecharge/request/builder/SafechargeBaseBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java similarity index 56% rename from src/main/java/com/safecharge/request/builder/SafechargeBaseBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java index 16662d1..e3de00e 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeBaseBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java @@ -1,28 +1,26 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; import javax.validation.ConstraintViolationException; -import com.safecharge.model.MerchantBaseInfo; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.SafechargeRequest; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.RequestUtils; +import com.nuvei.model.MerchantBaseInfo; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.RequestUtils; /** *

- * A base builder class for a request to Safecharge. + * A base builder class for a request to Nuvei. * - * @author Bozhidar Shumanov - * @see SafechargeBuilder + * @author Bozhidar Shumanov + * @see NuveiBuilder * @since 2/23/2017 */ -public abstract class SafechargeBaseBuilder> { +public abstract class NuveiBaseBuilder> { protected MerchantBaseInfo merchantInfo; private String clientRequestId; @@ -31,7 +29,7 @@ public abstract class SafechargeBaseBuilder> /** * Adds previously obtained {@code sessionToken} to the request. All requests(except the one to obtain session token) - * to Safecharge's API require a valid session token. Some requests (such as Payment*) consume it. + * to Nuvei's API require a valid session token. Some requests (such as Payment*) consume it. * * @param sessionToken Previously obtained session token as {@link String} * @return this object @@ -69,7 +67,7 @@ public T addInternalRequestId(String internalRequestId) { * @param merchantInfo A {@link MerchantBaseInfo} object to get the merchant info from, when building the request * @return this object * @see MerchantBaseInfo - * @see SafechargeBuilder#addMerchantInfo(String, String, String, String, Constants.HashAlgorithm) + * @see NuveiBuilder#addMerchantInfo(String, String, String, String, Constants.HashAlgorithm) */ public T addMerchantInfo(MerchantBaseInfo merchantInfo) { this.merchantInfo = merchantInfo; @@ -79,12 +77,12 @@ public T addMerchantInfo(MerchantBaseInfo merchantInfo) { /** * Adds required merchant info to the request. * - * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Safecharge - * @param serverHost The Safecharge's server address to send the request to + * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Nuvei + * @param serverHost The Nuvei's server address to send the request to * @param hashAlgorithm The hashing algorithm used to generate the checksum * @return this object * @see MerchantBaseInfo - * @see SafechargeBaseBuilder#addMerchantInfo(MerchantBaseInfo) + * @see NuveiBaseBuilder#addMerchantInfo(MerchantBaseInfo) */ public T addMerchantInfo(String merchantKey, String serverHost, Constants.HashAlgorithm hashAlgorithm) { this.merchantInfo = new MerchantBaseInfo(merchantKey, serverHost, hashAlgorithm); @@ -94,30 +92,30 @@ public T addMerchantInfo(String merchantKey, String serverHost, Constants.HashAl /** * Adds the common data, collected by this builder. The intent of this method is to be used from the derived classes. * - * @param safechargeBaseRequest an already created request of type <{@code T} extends {@link SafechargeBaseRequest}> + * @param NuveiBaseRequest an already created request of type <{@code T} extends {@link NuveiBaseRequest}> * @param type parameter - * @return the passed {@code safechargeBaseRequest} filled with the data from this builder + * @return the passed {@code nuveiBaseRequest} filled with the data from this builder */ - protected S build(S safechargeBaseRequest) { + protected S build(S nuveiBaseRequest) { String timestamp = RequestUtils.calculateTimestamp(); - safechargeBaseRequest.setServerHost(merchantInfo != null ? merchantInfo.getServerHost() : null); - safechargeBaseRequest.setSessionToken(sessionToken); - safechargeBaseRequest.setTimeStamp(timestamp); - safechargeBaseRequest.setClientRequestId(clientRequestId); - safechargeBaseRequest.setInternalRequestId(internalRequestId); - safechargeBaseRequest.setChecksum( - ChecksumUtils.calculateChecksum(safechargeBaseRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, + nuveiBaseRequest.setServerHost(merchantInfo != null ? merchantInfo.getServerHost() : null); + nuveiBaseRequest.setSessionToken(sessionToken); + nuveiBaseRequest.setTimeStamp(timestamp); + nuveiBaseRequest.setClientRequestId(clientRequestId); + nuveiBaseRequest.setInternalRequestId(internalRequestId); + nuveiBaseRequest.setChecksum( + ChecksumUtils.calculateChecksum(nuveiBaseRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); - return safechargeBaseRequest; + return nuveiBaseRequest; } /** * Builds the request. * - * @return the created SafechargeRequest + * @return the created NuveiRequest * @throws ConstraintViolationException if any part of the request is invalid */ - public abstract SafechargeBaseRequest build() throws ConstraintViolationException; + public abstract NuveiBaseRequest build() throws ConstraintViolationException; } \ No newline at end of file diff --git a/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java similarity index 87% rename from src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java index edb36d5..1dc0025 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeBaseOrderBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java @@ -1,40 +1,40 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; import java.util.ArrayList; import java.util.List; -import com.safecharge.model.Addendums; -import com.safecharge.model.AmountDetails; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.Item; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserAddress; -import com.safecharge.request.SafechargeOrderDetailsRequest; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.DeviceUtils; -import com.safecharge.util.MerchantUtils; -import com.safecharge.util.UrlUtils; +import com.nuvei.model.Addendums; +import com.nuvei.model.AmountDetails; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserAddress; +import com.nuvei.request.NuveiOrderDetailsRequest; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.DeviceUtils; +import com.nuvei.util.MerchantUtils; +import com.nuvei.util.UrlUtils; /** *

* A base builder for an order related requests. * - * @author Nikola Dichev - * @see SafechargeBuilder - * @see SafechargeCCBuilder - * @see SafechargeTransactionBuilder + * @author Nikola Dichev + * @see NuveiBuilder + * @see NuveiCCBuilder + * @see NuveiTransactionBuilder * @since 2/20/2017 */ -public abstract class SafechargeBaseOrderBuilder> extends SafechargeBaseBuilder { +public abstract class NuveiBaseOrderBuilder> extends NuveiBaseBuilder { private String currency; private String amount; @@ -472,35 +472,35 @@ public T addAmountDetails(String totalHandling, String totalShipping, String tot /** * Adds the order details data, collected by this builder. * - * @param safechargeOrderDetailsRequest an already created request of type T + * @param NuveiOrderDetailsRequest an already created request of type T * @param type parameter * @return this object */ - protected S build(S safechargeOrderDetailsRequest) { + protected S build(S nuveiOrderDetailsRequest) { - super.build(safechargeOrderDetailsRequest); + super.build(nuveiOrderDetailsRequest); - safechargeOrderDetailsRequest.setCurrency(currency); - safechargeOrderDetailsRequest.setAmount(amount); + nuveiOrderDetailsRequest.setCurrency(currency); + nuveiOrderDetailsRequest.setAmount(amount); for (Item item : items) { - safechargeOrderDetailsRequest.addItem(item); + nuveiOrderDetailsRequest.addItem(item); } - safechargeOrderDetailsRequest.setDeviceDetails(deviceDetails); - safechargeOrderDetailsRequest.setUserDetails(userDetails); - safechargeOrderDetailsRequest.setShippingAddress(shippingAddress); - safechargeOrderDetailsRequest.setBillingAddress(billingAddress); - safechargeOrderDetailsRequest.setDynamicDescriptor(dynamicDescriptor); - safechargeOrderDetailsRequest.setMerchantDetails(merchantDetails); - safechargeOrderDetailsRequest.setUrlDetails(urlDetails); - safechargeOrderDetailsRequest.setAddendums(addendums); - safechargeOrderDetailsRequest.setUserTokenId(userTokenId); - safechargeOrderDetailsRequest.setClientUniqueId(clientUniqueId); - safechargeOrderDetailsRequest.setAmountDetails(amountDetails); - - safechargeOrderDetailsRequest.setChecksum( - ChecksumUtils.calculateChecksum(safechargeOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", + nuveiOrderDetailsRequest.setDeviceDetails(deviceDetails); + nuveiOrderDetailsRequest.setUserDetails(userDetails); + nuveiOrderDetailsRequest.setShippingAddress(shippingAddress); + nuveiOrderDetailsRequest.setBillingAddress(billingAddress); + nuveiOrderDetailsRequest.setDynamicDescriptor(dynamicDescriptor); + nuveiOrderDetailsRequest.setMerchantDetails(merchantDetails); + nuveiOrderDetailsRequest.setUrlDetails(urlDetails); + nuveiOrderDetailsRequest.setAddendums(addendums); + nuveiOrderDetailsRequest.setUserTokenId(userTokenId); + nuveiOrderDetailsRequest.setClientUniqueId(clientUniqueId); + nuveiOrderDetailsRequest.setAmountDetails(amountDetails); + + nuveiOrderDetailsRequest.setChecksum( + ChecksumUtils.calculateChecksum(nuveiOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); - return safechargeOrderDetailsRequest; + return nuveiOrderDetailsRequest; } } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBuilder.java similarity index 53% rename from src/main/java/com/safecharge/request/builder/SafechargeBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiBuilder.java index 5b496c5..c3cf0de 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBuilder.java @@ -1,29 +1,29 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; import javax.validation.ConstraintViolationException; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.SafechargeRequest; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.RequestUtils; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.NuveiRequest; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.RequestUtils; /** *

- * A base builder class for a request to Safecharge. + * A base builder class for a request to Nuvei. * - * @author Nikola Dichev - * @see SafechargeCCBuilder - * @see SafechargeOrderBuilder - * @see SafechargeTransactionBuilder + * @author Nikola Dichev + * @see NuveiCCBuilder + * @see NuveiOrderBuilder + * @see NuveiTransactionBuilder * @since 2/23/2017 */ -public abstract class SafechargeBuilder> { +public abstract class NuveiBuilder> { protected MerchantInfo merchantInfo; private String clientRequestId; @@ -32,7 +32,7 @@ public abstract class SafechargeBuilder> { /** * Adds previously obtained {@code sessionToken} to the request. All requests(except the one to obtain session token) - * to Safecharge's API require a valid session token. Some requests (such as Payment*) consume it. + * to Nuvei's API require a valid session token. Some requests (such as Payment*) consume it. * * @param sessionToken Previously obtained session token as {@link String} * @return this object @@ -70,7 +70,7 @@ public T addInternalRequestId(String internalRequestId) { * @param merchantInfo A {@link MerchantInfo} object to get the merchant info from, when building the request * @return this object * @see MerchantInfo - * @see SafechargeBuilder#addMerchantInfo(String, String, String, String, Constants.HashAlgorithm) + * @see NuveiBuilder#addMerchantInfo(String, String, String, String, Constants.HashAlgorithm) */ public T addMerchantInfo(MerchantInfo merchantInfo) { this.merchantInfo = merchantInfo; @@ -80,14 +80,14 @@ public T addMerchantInfo(MerchantInfo merchantInfo) { /** * Adds required merchant info to the request. * - * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Safecharge - * @param merchantId Merchant id in the Safecharge's system - * @param merchantSiteId Merchant site id in the Safecharge's system - * @param serverHost The Safecharge's server address to send the request to + * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Nuvei + * @param merchantId Merchant id in the Nuvei's system + * @param merchantSiteId Merchant site id in the Nuvei's system + * @param serverHost The Nuvei's server address to send the request to * @param hashAlgorithm The hashing algorithm used to generate the checksum * @return this object * @see MerchantInfo - * @see SafechargeBuilder#addMerchantInfo(MerchantInfo) + * @see NuveiBuilder#addMerchantInfo(MerchantInfo) */ public T addMerchantInfo(String merchantKey, String merchantId, String merchantSiteId, String serverHost, Constants.HashAlgorithm hashAlgorithm) { this.merchantInfo = new MerchantInfo(merchantKey, merchantId, merchantSiteId, serverHost, hashAlgorithm); @@ -97,32 +97,32 @@ public T addMerchantInfo(String merchantKey, String merchantId, String merchantS /** * Adds the common data, collected by this builder. The intent of this method is to be used from the derived classes. * - * @param safechargeRequest an already created request of type <{@code T} extends {@link SafechargeRequest}> + * @param nuveiRequest an already created request of type <{@code T} extends {@link NuveiRequest}> * @param type parameter - * @return the passed {@code safechargeRequest} filled with the data from this builder + * @return the passed {@code nuveiRequest} filled with the data from this builder */ - protected S build(S safechargeRequest) { + protected S build(S nuveiRequest) { String timestamp = RequestUtils.calculateTimestamp(); - safechargeRequest.setMerchantId(merchantInfo != null ? merchantInfo.getMerchantId() : null); - safechargeRequest.setMerchantSiteId(merchantInfo != null ? merchantInfo.getMerchantSiteId() : null); - safechargeRequest.setServerHost(merchantInfo != null ? merchantInfo.getServerHost() : null); - safechargeRequest.setSessionToken(sessionToken); - safechargeRequest.setTimeStamp(timestamp); - safechargeRequest.setClientRequestId(clientRequestId); - safechargeRequest.setInternalRequestId(internalRequestId); - safechargeRequest.setChecksum( - ChecksumUtils.calculateChecksum(safechargeRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, + nuveiRequest.setMerchantId(merchantInfo != null ? merchantInfo.getMerchantId() : null); + nuveiRequest.setMerchantSiteId(merchantInfo != null ? merchantInfo.getMerchantSiteId() : null); + nuveiRequest.setServerHost(merchantInfo != null ? merchantInfo.getServerHost() : null); + nuveiRequest.setSessionToken(sessionToken); + nuveiRequest.setTimeStamp(timestamp); + nuveiRequest.setClientRequestId(clientRequestId); + nuveiRequest.setInternalRequestId(internalRequestId); + nuveiRequest.setChecksum( + ChecksumUtils.calculateChecksum(nuveiRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); - return safechargeRequest; + return nuveiRequest; } /** * Builds the request. * - * @return the created SafechargeRequest + * @return the created NuveiRequest * @throws ConstraintViolationException if any part of the request is invalid */ - public abstract SafechargeBaseRequest build() throws ConstraintViolationException; + public abstract NuveiBaseRequest build() throws ConstraintViolationException; } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeCCBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java similarity index 86% rename from src/main/java/com/safecharge/request/builder/SafechargeCCBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java index 30d01a2..81b1b18 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeCCBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java @@ -1,30 +1,30 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.model.CardData; -import com.safecharge.model.ExternalMpi; -import com.safecharge.model.ExternalSchemeDetails; -import com.safecharge.model.ExternalTokenProvider; -import com.safecharge.model.StoredCredentials; -import com.safecharge.model.UserPaymentOption; -import com.safecharge.request.SafechargeCCRequest; -import com.safecharge.util.CardUtils; +import com.nuvei.model.CardData; +import com.nuvei.model.ExternalMpi; +import com.nuvei.model.ExternalSchemeDetails; +import com.nuvei.model.ExternalTokenProvider; +import com.nuvei.model.StoredCredentials; +import com.nuvei.model.UserPaymentOption; +import com.nuvei.request.NuveiCCRequest; +import com.nuvei.util.CardUtils; /** *

* A base builder for a credit/debit card specific requests. *

* - * @author Nikola Dichev - * @see SafechargeBuilder - * @see SafechargeOrderBuilder - * @see SafechargeTransactionBuilder + * @author Nikola Dichev + * @see NuveiBuilder + * @see NuveiOrderBuilder + * @see NuveiTransactionBuilder * @since 4/4/2017 */ -public abstract class SafechargeCCBuilder> extends SafechargePaymentBuilder { +public abstract class NuveiCCBuilder> extends NuveiPaymentBuilder { private CardData cardData; private UserPaymentOption userPaymentOption; @@ -50,7 +50,7 @@ public T addOrderId(String orderId) { /** * Adds user payment option (UPO) to the request. It is the payment option that will be used for the transaction. * - * @param cvv the CVV code of the related credit/debit card. Note that CVV is not stored by Safecharge + * @param cvv the CVV code of the related credit/debit card. Note that CVV is not stored by Nuvei * @param userPaymentOptionId the id of the UPO to add to the request * @return this object */ @@ -165,7 +165,7 @@ public T addExternalSchemeDetails(ExternalSchemeDetails externalSchemeDetails) { * @param type parameter * @return the passed {@code request} filled with the data from this builder */ - public S build(S request) { + public S build(S request) { super.build(request); diff --git a/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java similarity index 88% rename from src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java index 5eb22b5..eb404ae 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeCashierUserBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.request.basic.CashierUserRequest; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; +import com.nuvei.request.basic.CashierUserRequest; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; -public abstract class SafechargeCashierUserBuilder> extends SafechargeBuilder { +public abstract class NuveiCashierUserBuilder> extends NuveiBuilder { private String userTokenId; private String firstName; diff --git a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java similarity index 87% rename from src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java index 050aaa3..a94454c 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeOrderBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java @@ -1,41 +1,41 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; import java.util.ArrayList; import java.util.List; -import com.safecharge.model.Addendums; -import com.safecharge.model.AmountDetails; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.Item; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.ShippingTrackingDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserAddress; -import com.safecharge.request.SafechargeOrderDetailsRequest; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.DeviceUtils; -import com.safecharge.util.MerchantUtils; -import com.safecharge.util.UrlUtils; +import com.nuvei.model.Addendums; +import com.nuvei.model.AmountDetails; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.ShippingTrackingDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserAddress; +import com.nuvei.request.NuveiOrderDetailsRequest; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.DeviceUtils; +import com.nuvei.util.MerchantUtils; +import com.nuvei.util.UrlUtils; /** *

* A base builder for an order related requests. *

* @author Nikola Dichev - * @see SafechargeBuilder - * @see SafechargeCCBuilder - * @see SafechargeTransactionBuilder + * @see NuveiBuilder + * @see NuveiCCBuilder + * @see NuveiTransactionBuilder * @since 2/20/2017 */ -public abstract class SafechargeOrderBuilder> extends SafechargeBuilder { +public abstract class NuveiOrderBuilder> extends NuveiBuilder { private String currency; private String amount; @@ -487,36 +487,36 @@ public T addShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDeta /** * Adds the order details data, collected by this builder. * - * @param safechargeOrderDetailsRequest an already created request of type T + * @param nuveiOrderDetailsRequest an already created request of type T * @param type parameter * @return this object */ - protected S build(S safechargeOrderDetailsRequest) { + protected S build(S nuveiOrderDetailsRequest) { - super.build(safechargeOrderDetailsRequest); + super.build(nuveiOrderDetailsRequest); - safechargeOrderDetailsRequest.setCurrency(currency); - safechargeOrderDetailsRequest.setAmount(amount); + nuveiOrderDetailsRequest.setCurrency(currency); + nuveiOrderDetailsRequest.setAmount(amount); for (Item item : items) { - safechargeOrderDetailsRequest.addItem(item); + nuveiOrderDetailsRequest.addItem(item); } - safechargeOrderDetailsRequest.setDeviceDetails(deviceDetails); - safechargeOrderDetailsRequest.setUserDetails(userDetails); - safechargeOrderDetailsRequest.setShippingAddress(shippingAddress); - safechargeOrderDetailsRequest.setBillingAddress(billingAddress); - safechargeOrderDetailsRequest.setDynamicDescriptor(dynamicDescriptor); - safechargeOrderDetailsRequest.setMerchantDetails(merchantDetails); - safechargeOrderDetailsRequest.setUrlDetails(urlDetails); - safechargeOrderDetailsRequest.setAddendums(addendums); - safechargeOrderDetailsRequest.setUserTokenId(userTokenId); - safechargeOrderDetailsRequest.setClientUniqueId(clientUniqueId); - safechargeOrderDetailsRequest.setAmountDetails(amountDetails); - safechargeOrderDetailsRequest.setShippingTrackingDetails(shippingTrackingDetails); - - safechargeOrderDetailsRequest.setChecksum( - ChecksumUtils.calculateChecksum(safechargeOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", + nuveiOrderDetailsRequest.setDeviceDetails(deviceDetails); + nuveiOrderDetailsRequest.setUserDetails(userDetails); + nuveiOrderDetailsRequest.setShippingAddress(shippingAddress); + nuveiOrderDetailsRequest.setBillingAddress(billingAddress); + nuveiOrderDetailsRequest.setDynamicDescriptor(dynamicDescriptor); + nuveiOrderDetailsRequest.setMerchantDetails(merchantDetails); + nuveiOrderDetailsRequest.setUrlDetails(urlDetails); + nuveiOrderDetailsRequest.setAddendums(addendums); + nuveiOrderDetailsRequest.setUserTokenId(userTokenId); + nuveiOrderDetailsRequest.setClientUniqueId(clientUniqueId); + nuveiOrderDetailsRequest.setAmountDetails(amountDetails); + nuveiOrderDetailsRequest.setShippingTrackingDetails(shippingTrackingDetails); + + nuveiOrderDetailsRequest.setChecksum( + ChecksumUtils.calculateChecksum(nuveiOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); - return safechargeOrderDetailsRequest; + return nuveiOrderDetailsRequest; } } diff --git a/src/main/java/com/safecharge/request/builder/SafechargeOrderWithDetailsBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java similarity index 78% rename from src/main/java/com/safecharge/request/builder/SafechargeOrderWithDetailsBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java index be8f8dd..d07830a 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeOrderWithDetailsBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.model.UserPaymentOption; -import com.safecharge.request.OrderRequestWithDetails; +import com.nuvei.model.UserPaymentOption; +import com.nuvei.request.OrderRequestWithDetails; /** *

* A base builder for order with details related requests. *

* - * @author Vassil Nikov - * @see SafechargeBuilder - * @see SafechargeOrderBuilder + * @author Vassil Nikov + * @see NuveiBuilder + * @see NuveiOrderBuilder */ -public abstract class SafechargeOrderWithDetailsBuilder> extends SafechargeOrderBuilder { +public abstract class NuveiOrderWithDetailsBuilder> extends NuveiOrderBuilder { private String paymentMethod; private UserPaymentOption userPaymentOption; diff --git a/src/main/java/com/safecharge/request/builder/SafechargePaymentBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java similarity index 80% rename from src/main/java/com/safecharge/request/builder/SafechargePaymentBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java index 07ff4aa..c5aba33 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargePaymentBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.request.SafechargePaymentRequest; -import com.safecharge.util.Constants; +import com.nuvei.request.NuveiPaymentRequest; +import com.nuvei.util.Constants; -public abstract class SafechargePaymentBuilder> extends SafechargeOrderBuilder { +public abstract class NuveiPaymentBuilder> extends NuveiOrderBuilder { private String customSiteName; private String productId; @@ -62,7 +62,7 @@ public T addRelatedTransactionId(String relatedTransactionId) { /** * Adds transaction type to the request. * - * @param transactionType the type of the transaction. Possible types: {@link com.safecharge.util.Constants.TransactionType} + * @param transactionType the type of the transaction. Possible types: {@link com.nuvei.util.Constants.TransactionType} * @return this object */ public T addTransactionType(Constants.TransactionType transactionType) { @@ -70,7 +70,7 @@ public T addTransactionType(Constants.TransactionType transactionType) { return (T) this; } - protected S build(S request) { + protected S build(S request) { super.build(request); request.setTransactionType(transactionType); diff --git a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java similarity index 71% rename from src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java index e5fc2c3..b4727b2 100644 --- a/src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java @@ -1,29 +1,28 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.model.CompanyDetails; -import com.safecharge.model.ShippingTrackingDetails; -import com.safecharge.model.SubMerchant; -import com.safecharge.model.UrlDetails; -import com.safecharge.request.SafechargeTransactionRequest; -import com.safecharge.util.ChecksumUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.UrlUtils; +import com.nuvei.model.CompanyDetails; +import com.nuvei.model.SubMerchant; +import com.nuvei.model.UrlDetails; +import com.nuvei.request.NuveiTransactionRequest; +import com.nuvei.util.ChecksumUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.UrlUtils; /** *

* A base builder for a transaction related requests. *

- * @author Nikola Dichev - * @see SafechargeBuilder - * @see SafechargeCCBuilder - * @see SafechargeOrderBuilder + * @author Nikola Dichev + * @see NuveiBuilder + * @see NuveiCCBuilder + * @see NuveiOrderBuilder * @since 3/22/2017 */ -public abstract class SafechargeTransactionBuilder> extends SafechargeBuilder { +public abstract class NuveiTransactionBuilder> extends NuveiBuilder { private String amount; private String currency; @@ -36,6 +35,7 @@ public abstract class SafechargeTransactionBuilder type parameter * @return this object */ - protected S build(S safechargeTransactionRequest) { - - super.build(safechargeTransactionRequest); - - safechargeTransactionRequest.setAmount(amount); - safechargeTransactionRequest.setCurrency(currency); - safechargeTransactionRequest.setAuthCode(authCode); - safechargeTransactionRequest.setComment(comment); - safechargeTransactionRequest.setClientUniqueId(clientUniqueId); - safechargeTransactionRequest.setUrlDetails(urlDetails); - safechargeTransactionRequest.setCustomSiteName(customSiteName); - safechargeTransactionRequest.setProductId(productId); - safechargeTransactionRequest.setCustomData(customData); - safechargeTransactionRequest.setSubMerchant(subMerchant); - safechargeTransactionRequest.setChecksum( - ChecksumUtils.calculateChecksum(safechargeTransactionRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", + protected S build(S nuveiTransactionRequest) { + + super.build(nuveiTransactionRequest); + + nuveiTransactionRequest.setAmount(amount); + nuveiTransactionRequest.setCurrency(currency); + nuveiTransactionRequest.setAuthCode(authCode); + nuveiTransactionRequest.setComment(comment); + nuveiTransactionRequest.setClientUniqueId(clientUniqueId); + nuveiTransactionRequest.setUrlDetails(urlDetails); + nuveiTransactionRequest.setCustomSiteName(customSiteName); + nuveiTransactionRequest.setProductId(productId); + nuveiTransactionRequest.setCustomData(customData); + nuveiTransactionRequest.setSubMerchant(subMerchant); + nuveiTransactionRequest.setChecksum( + ChecksumUtils.calculateChecksum(nuveiTransactionRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", Constants.CHARSET_UTF8, merchantInfo != null ? merchantInfo.getHashAlgorithm() : null)); - safechargeTransactionRequest.setCompanyDetails(companyDetails); + nuveiTransactionRequest.setCompanyDetails(companyDetails); - return safechargeTransactionRequest; + return nuveiTransactionRequest; } } diff --git a/src/main/java/com/safecharge/request/builder/PaymentBuilder.java b/src/main/java/com/nuvei/request/builder/PaymentBuilder.java similarity index 81% rename from src/main/java/com/safecharge/request/builder/PaymentBuilder.java rename to src/main/java/com/nuvei/request/builder/PaymentBuilder.java index 81a7096..48c4dd5 100644 --- a/src/main/java/com/safecharge/request/builder/PaymentBuilder.java +++ b/src/main/java/com/nuvei/request/builder/PaymentBuilder.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.request.builder; +package com.nuvei.request.builder; -import com.safecharge.model.PaymentOption; -import com.safecharge.request.PaymentRequest; +import com.nuvei.model.PaymentOption; +import com.nuvei.request.PaymentRequest; -public abstract class PaymentBuilder> extends SafechargePaymentBuilder { +public abstract class PaymentBuilder> extends NuveiPaymentBuilder { private PaymentOption paymentOption; private Integer isRebilling; diff --git a/src/main/java/com/safecharge/response/AccountCaptureResponse.java b/src/main/java/com/nuvei/response/AccountCaptureResponse.java similarity index 69% rename from src/main/java/com/safecharge/response/AccountCaptureResponse.java rename to src/main/java/com/nuvei/response/AccountCaptureResponse.java index dfcb3a7..15ef3c6 100644 --- a/src/main/java/com/safecharge/response/AccountCaptureResponse.java +++ b/src/main/java/com/nuvei/response/AccountCaptureResponse.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.AccountCaptureRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.AccountCaptureRequest}. *

* - * @see com.safecharge.request.AccountCaptureRequest + * @see com.nuvei.request.AccountCaptureRequest * @since 29/04/2021 */ -public class AccountCaptureResponse extends SafechargeResponse { +public class AccountCaptureResponse extends NuveiResponse { private String redirectUrl; private String userTokenId; diff --git a/src/main/java/com/safecharge/response/AddUPOAPMResponse.java b/src/main/java/com/nuvei/response/AddUPOAPMResponse.java similarity index 66% rename from src/main/java/com/safecharge/response/AddUPOAPMResponse.java rename to src/main/java/com/nuvei/response/AddUPOAPMResponse.java index eae65fb..ba70e11 100644 --- a/src/main/java/com/safecharge/response/AddUPOAPMResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOAPMResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.AddUPOAPMRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.AddUPOAPMRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.AddUPOAPMRequest + * @author Nikola Dichev + * @see com.nuvei.request.AddUPOAPMRequest * @since 3/22/2017 */ -public class AddUPOAPMResponse extends SafechargeResponse { +public class AddUPOAPMResponse extends NuveiResponse { /** * The id of the created User Payment Option(UPO), if the request is successful. diff --git a/src/main/java/com/safecharge/response/AddUPOCreditCardByTempTokenResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java similarity index 64% rename from src/main/java/com/safecharge/response/AddUPOCreditCardByTempTokenResponse.java rename to src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java index 019fa1c..1298670 100644 --- a/src/main/java/com/safecharge/response/AddUPOCreditCardByTempTokenResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.AddUPOCreditCardByTempTokenRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.AddUPOCreditCardByTempTokenRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.AddUPOCreditCardByTempTokenRequest + * @author Nikola Dichev + * @see com.nuvei.request.AddUPOCreditCardByTempTokenRequest * @since 3/10/2017 */ -public class AddUPOCreditCardByTempTokenResponse extends SafechargeResponse { +public class AddUPOCreditCardByTempTokenResponse extends NuveiResponse { /** * The id of the created User Payment Option(UPO), if the request is successful. diff --git a/src/main/java/com/safecharge/response/AddUPOCreditCardByTokenResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java similarity index 64% rename from src/main/java/com/safecharge/response/AddUPOCreditCardByTokenResponse.java rename to src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java index 1b4fa03..cd9d207 100644 --- a/src/main/java/com/safecharge/response/AddUPOCreditCardByTokenResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.AddUPOCreditCardByTempTokenRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.AddUPOCreditCardByTempTokenRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.AddUPOCreditCardByTempTokenRequest + * @author Nikola Dichev + * @see com.nuvei.request.AddUPOCreditCardByTempTokenRequest * @since 3/10/2017 */ -public class AddUPOCreditCardByTokenResponse extends SafechargeResponse { +public class AddUPOCreditCardByTokenResponse extends NuveiResponse { /** * The id of the created User Payment Option(UPO), if the request is successful. diff --git a/src/main/java/com/safecharge/response/AddUPOCreditCardResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java similarity index 89% rename from src/main/java/com/safecharge/response/AddUPOCreditCardResponse.java rename to src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java index 26ab61f..1c10d10 100644 --- a/src/main/java/com/safecharge/response/AddUPOCreditCardResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.UserDetails; +import com.nuvei.model.UserDetails; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.AddUPOCreditCardRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.AddUPOCreditCardRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.AddUPOCreditCardRequest + * @author Nikola Dichev + * @see com.nuvei.request.AddUPOCreditCardRequest * @since 3/22/2017 */ -public class AddUPOCreditCardResponse extends SafechargeResponse { +public class AddUPOCreditCardResponse extends NuveiResponse { /** * The id of the created User Payment Option(UPO), if the request is successful. diff --git a/src/main/java/com/safecharge/response/Authorization3DResponse.java b/src/main/java/com/nuvei/response/Authorization3DResponse.java similarity index 79% rename from src/main/java/com/safecharge/response/Authorization3DResponse.java rename to src/main/java/com/nuvei/response/Authorization3DResponse.java index a122323..545fd1f 100644 --- a/src/main/java/com/safecharge/response/Authorization3DResponse.java +++ b/src/main/java/com/nuvei/response/Authorization3DResponse.java @@ -1,16 +1,16 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.Authorization3DRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.Authorization3DRequest}. * - * @author Nikola Dichev - * @see 3D Secure documentation - * @see com.safecharge.request.Authorization3DRequest + * @author Nikola Dichev + * @see 3D Secure documentation + * @see com.nuvei.request.Authorization3DRequest * @since 2/15/2017 */ public class Authorization3DResponse extends PaymentsCCResponse { diff --git a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java similarity index 95% rename from src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java rename to src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java index a53670e..b23433b 100644 --- a/src/main/java/com/safecharge/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.AmountInfo; -import com.safecharge.model.FraudDetails; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.PaymentOptionResponse; +import com.nuvei.model.AmountInfo; +import com.nuvei.model.FraudDetails; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.PaymentOptionResponse; -public abstract class Authorize3dAndPaymentResponse extends SafechargeResponse { +public abstract class Authorize3dAndPaymentResponse extends NuveiResponse { private String orderId; diff --git a/src/main/java/com/nuvei/response/Authorize3dResponse.java b/src/main/java/com/nuvei/response/Authorize3dResponse.java new file mode 100644 index 0000000..6701f8f --- /dev/null +++ b/src/main/java/com/nuvei/response/Authorize3dResponse.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.Authorize3dRequest} + *

+ */ +public class Authorize3dResponse extends Authorize3dAndPaymentResponse { +} diff --git a/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java b/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java new file mode 100644 index 0000000..dfcfa45 --- /dev/null +++ b/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.CancelSubscriptionRequest}. + * + * @author Nikola Dichev + * @see com.nuvei.request.CancelSubscriptionRequest + * @since 6/6/2017 + */ +public class CancelSubscriptionResponse extends NuveiResponse { + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("CancelSubscriptionResponse{"); + sb.append(super.toString()); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/main/java/com/safecharge/response/CardDetailsResponse.java b/src/main/java/com/nuvei/response/CardDetailsResponse.java similarity index 84% rename from src/main/java/com/safecharge/response/CardDetailsResponse.java rename to src/main/java/com/nuvei/response/CardDetailsResponse.java index f30adb4..1e97b96 100644 --- a/src/main/java/com/safecharge/response/CardDetailsResponse.java +++ b/src/main/java/com/nuvei/response/CardDetailsResponse.java @@ -1,21 +1,21 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.request.CardDetailsRequest; +import com.nuvei.request.CardDetailsRequest; /** *

- * Response received from the SafeCharge's servers to the {@link CardDetailsRequest} + * Response received from the Nuvei's servers to the {@link CardDetailsRequest} *

* * @see CardDetailsRequest * @since 7/27/2020 */ -public class CardDetailsResponse extends SafechargeResponse { +public class CardDetailsResponse extends NuveiResponse { private String brand; private String cardType; diff --git a/src/main/java/com/safecharge/response/CardTokenizationResponse.java b/src/main/java/com/nuvei/response/CardTokenizationResponse.java similarity index 85% rename from src/main/java/com/safecharge/response/CardTokenizationResponse.java rename to src/main/java/com/nuvei/response/CardTokenizationResponse.java index 02d0ac9..6e1a327 100644 --- a/src/main/java/com/safecharge/response/CardTokenizationResponse.java +++ b/src/main/java/com/nuvei/response/CardTokenizationResponse.java @@ -1,21 +1,21 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.FraudDetails; +import com.nuvei.model.FraudDetails; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.CardTokenizationRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.CardTokenizationRequest}. *

* @author Nikola Dichev - * @see Card Tokenization documentation - * @see com.safecharge.request.CardTokenizationRequest + * @see Card Tokenization documentation + * @see com.nuvei.request.CardTokenizationRequest * @since 2/15/2017 */ -public class CardTokenizationResponse extends SafechargeResponse { +public class CardTokenizationResponse extends NuveiResponse { /** * The generated card's temporary token, if the request is successful. diff --git a/src/main/java/com/safecharge/response/CreateSubscriptionResponse.java b/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java similarity index 61% rename from src/main/java/com/safecharge/response/CreateSubscriptionResponse.java rename to src/main/java/com/nuvei/response/CreateSubscriptionResponse.java index 4fe1875..12f170a 100644 --- a/src/main/java/com/safecharge/response/CreateSubscriptionResponse.java +++ b/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.CreateSubscriptionRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.CreateSubscriptionRequest}. *

- * @author Nikola Dichev - * @see com.safecharge.request.CreateSubscriptionRequest + * @author Nikola Dichev + * @see com.nuvei.request.CreateSubscriptionRequest * @since 6/6/2017 */ -public class CreateSubscriptionResponse extends SafechargeResponse { +public class CreateSubscriptionResponse extends NuveiResponse { private String subscriptionId; diff --git a/src/main/java/com/safecharge/response/DccDetailsResponse.java b/src/main/java/com/nuvei/response/DccDetailsResponse.java similarity index 90% rename from src/main/java/com/safecharge/response/DccDetailsResponse.java rename to src/main/java/com/nuvei/response/DccDetailsResponse.java index 1d96f12..9ae0ca7 100644 --- a/src/main/java/com/safecharge/response/DccDetailsResponse.java +++ b/src/main/java/com/nuvei/response/DccDetailsResponse.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -public class DccDetailsResponse extends SafechargeResponse { +public class DccDetailsResponse extends NuveiResponse { private String rateValueWitMarkUp; diff --git a/src/main/java/com/nuvei/response/DeleteUPOResponse.java b/src/main/java/com/nuvei/response/DeleteUPOResponse.java new file mode 100644 index 0000000..73025d9 --- /dev/null +++ b/src/main/java/com/nuvei/response/DeleteUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.DeleteUPORequest}. + * + * @author Bozhidar Shumanov + * @since 1/29/2018 + */ +public class DeleteUPOResponse extends NuveiResponse { + +} diff --git a/src/main/java/com/nuvei/response/Dynamic3DResponse.java b/src/main/java/com/nuvei/response/Dynamic3DResponse.java new file mode 100644 index 0000000..3262d38 --- /dev/null +++ b/src/main/java/com/nuvei/response/Dynamic3DResponse.java @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +public class Dynamic3DResponse extends Authorization3DResponse { + +} diff --git a/src/main/java/com/nuvei/response/EditUPOAPMResponse.java b/src/main/java/com/nuvei/response/EditUPOAPMResponse.java new file mode 100644 index 0000000..327417e --- /dev/null +++ b/src/main/java/com/nuvei/response/EditUPOAPMResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.EditUPOAPMRequest}. + * + * @author Bozhidar Shumanov + * @since 1/29/2018 + */ +public class EditUPOAPMResponse extends NuveiResponse { + +} diff --git a/src/main/java/com/safecharge/response/EditUPOCreditCardResponse.java b/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java similarity index 59% rename from src/main/java/com/safecharge/response/EditUPOCreditCardResponse.java rename to src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java index 62595dc..2199a6a 100644 --- a/src/main/java/com/safecharge/response/EditUPOCreditCardResponse.java +++ b/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

@@ -11,8 +11,8 @@ * This goal of this request is to add a credit card UPO for a specific user according to their User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 3/21/2017 */ -public class EditUPOCreditCardResponse extends SafechargeResponse { +public class EditUPOCreditCardResponse extends NuveiResponse { } diff --git a/src/main/java/com/nuvei/response/EnableUPOResponse.java b/src/main/java/com/nuvei/response/EnableUPOResponse.java new file mode 100644 index 0000000..a25a23c --- /dev/null +++ b/src/main/java/com/nuvei/response/EnableUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.EnableUPORequest}. + * + * @author Bozhidar Shumanov + * @since 1/29/2018 + */ +public class EnableUPOResponse extends NuveiResponse { + +} diff --git a/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java b/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java similarity index 74% rename from src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java rename to src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java index 2e5efe3..3f9292b 100644 --- a/src/main/java/com/safecharge/response/GetMerchantPaymentMethodsResponse.java +++ b/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.List; -import com.safecharge.model.PaymentMethod; +import com.nuvei.model.PaymentMethod; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.GetMerchantPaymentMethodsRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.GetMerchantPaymentMethodsRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.GetMerchantPaymentMethodsRequest + * @author Nikola Dichev + * @see com.nuvei.request.GetMerchantPaymentMethodsRequest * @since 4/7/2017 */ -public class GetMerchantPaymentMethodsResponse extends SafechargeResponse { +public class GetMerchantPaymentMethodsResponse extends NuveiResponse { /** * List of {@link PaymentMethod} objects containing the available payment options per the GetMerchantPaymentMethodsRequest diff --git a/src/main/java/com/safecharge/response/GetOrderDetailsResponse.java b/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java similarity index 89% rename from src/main/java/com/safecharge/response/GetOrderDetailsResponse.java rename to src/main/java/com/nuvei/response/GetOrderDetailsResponse.java index 560e98c..7be67c5 100644 --- a/src/main/java/com/safecharge/response/GetOrderDetailsResponse.java +++ b/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java @@ -1,31 +1,31 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.List; -import com.safecharge.model.Addendums; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.DeviceDetails; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.Item; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.UserAddress; +import com.nuvei.model.Addendums; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.DeviceDetails; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.UserAddress; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.GetOrderDetailsRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.GetOrderDetailsRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.GetOrderDetailsRequest + * @author Nikola Dichev + * @see com.nuvei.request.GetOrderDetailsRequest * @since 2/15/2017 */ -public class GetOrderDetailsResponse extends SafechargeResponse implements SafechargeOrderResponse { +public class GetOrderDetailsResponse extends NuveiResponse implements NuveiOrderResponse { /** - * The order ID provided by SafeCharge. + * The order ID provided by Nuvei. */ private String orderId; diff --git a/src/main/java/com/safecharge/response/GetPaymentStatusResponse.java b/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java similarity index 93% rename from src/main/java/com/safecharge/response/GetPaymentStatusResponse.java rename to src/main/java/com/nuvei/response/GetPaymentStatusResponse.java index ea56625..02300de 100644 --- a/src/main/java/com/safecharge/response/GetPaymentStatusResponse.java +++ b/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.AmountInfo; -import com.safecharge.model.PaymentDetailsPaymentOption; +import com.nuvei.model.AmountInfo; +import com.nuvei.model.PaymentDetailsPaymentOption; -public class GetPaymentStatusResponse extends SafechargeResponse { +public class GetPaymentStatusResponse extends NuveiResponse { private String customData; diff --git a/src/main/java/com/safecharge/response/GetPayoutStatusResponse.java b/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java similarity index 94% rename from src/main/java/com/safecharge/response/GetPayoutStatusResponse.java rename to src/main/java/com/nuvei/response/GetPayoutStatusResponse.java index 77cb16d..917543e 100644 --- a/src/main/java/com/safecharge/response/GetPayoutStatusResponse.java +++ b/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.PaymentOption; +import com.nuvei.model.PaymentOption; -public class GetPayoutStatusResponse extends SafechargeResponse { +public class GetPayoutStatusResponse extends NuveiResponse { private String transactionStatus; diff --git a/src/main/java/com/nuvei/response/GetSessionTokenResponse.java b/src/main/java/com/nuvei/response/GetSessionTokenResponse.java new file mode 100644 index 0000000..fdd3451 --- /dev/null +++ b/src/main/java/com/nuvei/response/GetSessionTokenResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.GetSessionTokenRequest}. + * + * @author Nikola Dichev + * @see com.nuvei.request.GetSessionTokenRequest + * @since 2/15/2017 + */ +public class GetSessionTokenResponse extends NuveiResponse { + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("GetSessionTokenResponse{"); + sb.append(super.toString()); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/main/java/com/safecharge/response/GetSubscriptionPlansResponse.java b/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java similarity index 63% rename from src/main/java/com/safecharge/response/GetSubscriptionPlansResponse.java rename to src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java index 20bac3d..64afdad 100644 --- a/src/main/java/com/safecharge/response/GetSubscriptionPlansResponse.java +++ b/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.List; -import com.safecharge.model.SubscriptionPlan; +import com.nuvei.model.SubscriptionPlan; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.GetSubscriptionPlansRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.GetSubscriptionPlansRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.GetSubscriptionPlansRequest + * @author Nikola Dichev + * @see com.nuvei.request.GetSubscriptionPlansRequest * @since 6/6/2017 */ -public class GetSubscriptionPlansResponse extends SafechargeResponse { +public class GetSubscriptionPlansResponse extends NuveiResponse { /** * List of the available subscription plans as {@link SubscriptionPlan} objects. diff --git a/src/main/java/com/safecharge/response/GetSubscriptionsListResponse.java b/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java similarity index 70% rename from src/main/java/com/safecharge/response/GetSubscriptionsListResponse.java rename to src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java index 82bc907..5ab4bdc 100644 --- a/src/main/java/com/safecharge/response/GetSubscriptionsListResponse.java +++ b/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.List; -import com.safecharge.model.SubscriptionsListElement; +import com.nuvei.model.SubscriptionsListElement; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.GetSubscriptionsListRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.GetSubscriptionsListRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.GetSubscriptionsListRequest + * @author Nikola Dichev + * @see com.nuvei.request.GetSubscriptionsListRequest * @since 6/6/2017 */ -public class GetSubscriptionsListResponse extends SafechargeResponse { +public class GetSubscriptionsListResponse extends NuveiResponse { /** * The list of the subscriptions per user. diff --git a/src/main/java/com/safecharge/response/GetUserDetailsResponse.java b/src/main/java/com/nuvei/response/GetUserDetailsResponse.java similarity index 53% rename from src/main/java/com/safecharge/response/GetUserDetailsResponse.java rename to src/main/java/com/nuvei/response/GetUserDetailsResponse.java index e4ed961..ab57678 100644 --- a/src/main/java/com/safecharge/response/GetUserDetailsResponse.java +++ b/src/main/java/com/nuvei/response/GetUserDetailsResponse.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.UserDetailsCashier; +import com.nuvei.model.UserDetailsCashier; -public class GetUserDetailsResponse extends SafechargeResponse { +public class GetUserDetailsResponse extends NuveiResponse { UserDetailsCashier userDetails; diff --git a/src/main/java/com/safecharge/response/GetUserUPOsResponse.java b/src/main/java/com/nuvei/response/GetUserUPOsResponse.java similarity index 68% rename from src/main/java/com/safecharge/response/GetUserUPOsResponse.java rename to src/main/java/com/nuvei/response/GetUserUPOsResponse.java index 160744a..74d7acc 100644 --- a/src/main/java/com/safecharge/response/GetUserUPOsResponse.java +++ b/src/main/java/com/nuvei/response/GetUserUPOsResponse.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.ArrayList; import java.util.List; -import com.safecharge.model.CashierPaymentMethodDetails; +import com.nuvei.model.CashierPaymentMethodDetails; /** *

@@ -16,10 +16,10 @@ * This goal of this request is to add a credit card UPO for a specific user according to their User Token ID. * Once a credit card UPO is added to the user’s list of UPOs, the credit card is displayed in the payment page. * - * @author Bozhidar Shumanov + * @author Bozhidar Shumanov * @since 3/21/2017 */ -public class GetUserUPOsResponse extends SafechargeResponse { +public class GetUserUPOsResponse extends NuveiResponse { private final List paymentMethods = new ArrayList(); diff --git a/src/main/java/com/safecharge/response/InitPaymentResponse.java b/src/main/java/com/nuvei/response/InitPaymentResponse.java similarity index 94% rename from src/main/java/com/safecharge/response/InitPaymentResponse.java rename to src/main/java/com/nuvei/response/InitPaymentResponse.java index 2ccc336..f194449 100644 --- a/src/main/java/com/safecharge/response/InitPaymentResponse.java +++ b/src/main/java/com/nuvei/response/InitPaymentResponse.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.PaymentOptionResponse; -import com.safecharge.util.Constants.CardAuthMethod; +import com.nuvei.model.PaymentOptionResponse; +import com.nuvei.util.Constants.CardAuthMethod; -public class InitPaymentResponse extends SafechargeResponse { +public class InitPaymentResponse extends NuveiResponse { private String orderId; diff --git a/src/main/java/com/safecharge/response/McpRatesResponse.java b/src/main/java/com/nuvei/response/McpRatesResponse.java similarity index 61% rename from src/main/java/com/safecharge/response/McpRatesResponse.java rename to src/main/java/com/nuvei/response/McpRatesResponse.java index af9d998..9cce376 100644 --- a/src/main/java/com/safecharge/response/McpRatesResponse.java +++ b/src/main/java/com/nuvei/response/McpRatesResponse.java @@ -1,24 +1,24 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; import java.util.ArrayList; import java.util.List; -import com.safecharge.model.Rate; +import com.nuvei.model.Rate; /** *

- * Response received from the Safecharge's servers to the {@link com.safecharge.request.McpRatesRequest} + * Response received from the Nuvei's servers to the {@link com.nuvei.request.McpRatesRequest} *

* - * @see com.safecharge.request.McpRatesRequest + * @see com.nuvei.request.McpRatesRequest */ -public class McpRatesResponse extends SafechargeResponse { +public class McpRatesResponse extends NuveiResponse { private String mcpTimestamp; diff --git a/src/main/java/com/safecharge/response/SafechargeOrderResponse.java b/src/main/java/com/nuvei/response/NuveiOrderResponse.java similarity index 61% rename from src/main/java/com/safecharge/response/SafechargeOrderResponse.java rename to src/main/java/com/nuvei/response/NuveiOrderResponse.java index d356bd7..7aa8f24 100644 --- a/src/main/java/com/safecharge/response/SafechargeOrderResponse.java +++ b/src/main/java/com/nuvei/response/NuveiOrderResponse.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** * * Interface that all responses working with order must implement. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ -public interface SafechargeOrderResponse { +public interface NuveiOrderResponse { /** * @return Merchant Order ID to be used as input parameter in update method and payment methods. diff --git a/src/main/java/com/safecharge/response/SafechargeResponse.java b/src/main/java/com/nuvei/response/NuveiResponse.java similarity index 91% rename from src/main/java/com/safecharge/response/SafechargeResponse.java rename to src/main/java/com/nuvei/response/NuveiResponse.java index 9f91cfc..8193078 100644 --- a/src/main/java/com/safecharge/response/SafechargeResponse.java +++ b/src/main/java/com/nuvei/response/NuveiResponse.java @@ -1,24 +1,24 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.util.Constants; +import com.nuvei.util.Constants; /** *

- * Abstract class to be used as a base for all of the responses from SafeCharge's servers. + * Abstract class to be used as a base for all of the responses from Nuvei's servers. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/14/2017 */ -public abstract class SafechargeResponse { +public abstract class NuveiResponse { private static final long serialVersionUID = 4104056768008786142L; /** - * SafeCharge Internal unique request id (used for reconciliation purpose etc.). + * Nuvei Internal unique request id (used for reconciliation purpose etc.). */ private Long internalRequestId; @@ -38,12 +38,12 @@ public abstract class SafechargeResponse { private String reason = ""; /** - * The Merchant ID provided by SafeCharge. + * The Merchant ID provided by Nuvei. */ private String merchantId; /** - * The Merchant Site ID provided by SafeCharge. + * The Merchant Site ID provided by Nuvei. */ private String merchantSiteId; @@ -87,7 +87,7 @@ public abstract class SafechargeResponse { */ private String json; - public SafechargeResponse() { + public NuveiResponse() { } public Long getInternalRequestId() { diff --git a/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java b/src/main/java/com/nuvei/response/NuveiTransactionResponse.java similarity index 98% rename from src/main/java/com/safecharge/response/SafechargeTransactionResponse.java rename to src/main/java/com/nuvei/response/NuveiTransactionResponse.java index 9068027..d6ebbd8 100644 --- a/src/main/java/com/safecharge/response/SafechargeTransactionResponse.java +++ b/src/main/java/com/nuvei/response/NuveiTransactionResponse.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.ExternalTokenInfo; -import com.safecharge.model.FraudDetails; -import com.safecharge.model.PartialApprovalDetails; +import com.nuvei.model.ExternalTokenInfo; +import com.nuvei.model.FraudDetails; +import com.nuvei.model.PartialApprovalDetails; /** *

@@ -15,7 +15,7 @@ * @author Nikola Dichev * @since 3/20/2017 */ -public abstract class SafechargeTransactionResponse extends SafechargeResponse { +public abstract class NuveiTransactionResponse extends NuveiResponse { /** * The transaction ID of the transaction for future actions. diff --git a/src/main/java/com/safecharge/response/OpenOrderResponse.java b/src/main/java/com/nuvei/response/OpenOrderResponse.java similarity index 77% rename from src/main/java/com/safecharge/response/OpenOrderResponse.java rename to src/main/java/com/nuvei/response/OpenOrderResponse.java index 99931ec..47de792 100644 --- a/src/main/java/com/safecharge/response/OpenOrderResponse.java +++ b/src/main/java/com/nuvei/response/OpenOrderResponse.java @@ -1,20 +1,20 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.MerchantDetails; +import com.nuvei.model.MerchantDetails; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.OpenOrderRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.OpenOrderRequest}. *

* @author Nikola Dichev - * @see com.safecharge.request.OpenOrderRequest + * @see com.nuvei.request.OpenOrderRequest * @since 2/15/2017 */ -public class OpenOrderResponse extends SafechargeResponse implements SafechargeOrderResponse { +public class OpenOrderResponse extends NuveiResponse implements NuveiOrderResponse { /** * Merchant Order ID to be used as input parameter in update method and payment methods. The parameter passed to define which merchant order to update. diff --git a/src/main/java/com/safecharge/response/Payment3DResponse.java b/src/main/java/com/nuvei/response/Payment3DResponse.java similarity index 80% rename from src/main/java/com/safecharge/response/Payment3DResponse.java rename to src/main/java/com/nuvei/response/Payment3DResponse.java index ee32bdd..ce69ffe 100644 --- a/src/main/java/com/safecharge/response/Payment3DResponse.java +++ b/src/main/java/com/nuvei/response/Payment3DResponse.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.Payment3DRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.Payment3DRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.Payment3DRequest + * @author Nikola Dichev + * @see com.nuvei.request.Payment3DRequest * @since 3/10/2017 */ public class Payment3DResponse extends PaymentsCCResponse { diff --git a/src/main/java/com/safecharge/response/PaymentAPMResponse.java b/src/main/java/com/nuvei/response/PaymentAPMResponse.java similarity index 74% rename from src/main/java/com/safecharge/response/PaymentAPMResponse.java rename to src/main/java/com/nuvei/response/PaymentAPMResponse.java index b56684b..fc85a7b 100644 --- a/src/main/java/com/safecharge/response/PaymentAPMResponse.java +++ b/src/main/java/com/nuvei/response/PaymentAPMResponse.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.PaymentAPMRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.PaymentAPMRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.PaymentAPMRequest + * @author Nikola Dichev + * @see com.nuvei.request.PaymentAPMRequest * @since 2/15/2017 */ public class PaymentAPMResponse extends PaymentsResponse { diff --git a/src/main/java/com/safecharge/response/PaymentCCResponse.java b/src/main/java/com/nuvei/response/PaymentCCResponse.java similarity index 50% rename from src/main/java/com/safecharge/response/PaymentCCResponse.java rename to src/main/java/com/nuvei/response/PaymentCCResponse.java index 62228aa..f29d66b 100644 --- a/src/main/java/com/safecharge/response/PaymentCCResponse.java +++ b/src/main/java/com/nuvei/response/PaymentCCResponse.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.PaymentCCRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.PaymentCCRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.PaymentCCRequest + * @author Nikola Dichev + * @see com.nuvei.request.PaymentCCRequest * @since 2/15/2017 */ public class PaymentCCResponse extends PaymentsCCResponse { diff --git a/src/main/java/com/nuvei/response/PaymentResponse.java b/src/main/java/com/nuvei/response/PaymentResponse.java new file mode 100644 index 0000000..eff4e60 --- /dev/null +++ b/src/main/java/com/nuvei/response/PaymentResponse.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.PaymentRequest} + *

+ */ +public class PaymentResponse extends Authorize3dAndPaymentResponse { +} diff --git a/src/main/java/com/safecharge/response/PaymentsCCResponse.java b/src/main/java/com/nuvei/response/PaymentsCCResponse.java similarity index 94% rename from src/main/java/com/safecharge/response/PaymentsCCResponse.java rename to src/main/java/com/nuvei/response/PaymentsCCResponse.java index bdeb1e5..4d0568a 100644 --- a/src/main/java/com/safecharge/response/PaymentsCCResponse.java +++ b/src/main/java/com/nuvei/response/PaymentsCCResponse.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.FraudDetails; -import com.safecharge.model.PartialApprovalDetails; +import com.nuvei.model.FraudDetails; +import com.nuvei.model.PartialApprovalDetails; public class PaymentsCCResponse extends PaymentsResponse { diff --git a/src/main/java/com/safecharge/response/PaymentsResponse.java b/src/main/java/com/nuvei/response/PaymentsResponse.java similarity index 94% rename from src/main/java/com/safecharge/response/PaymentsResponse.java rename to src/main/java/com/nuvei/response/PaymentsResponse.java index 4870ad4..6919f1a 100644 --- a/src/main/java/com/safecharge/response/PaymentsResponse.java +++ b/src/main/java/com/nuvei/response/PaymentsResponse.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.ApiExternalToken; +import com.nuvei.model.ApiExternalToken; /** *

* Abstract class to be used as a base for payment responses. * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/10/2017 */ -public abstract class PaymentsResponse extends SafechargeResponse { +public abstract class PaymentsResponse extends NuveiResponse { /** * Тhe Merchant Order ID to be used as input parameter in update method and payment methods. @@ -78,7 +78,7 @@ public abstract class PaymentsResponse extends SafechargeResponse { protected String userTokenId; /** - * This block contain external token parameters arriving from a 3rd party payment provider which is not SafeCharge (such as CreditGuard ect.) + * This block contain external token parameters arriving from a 3rd party payment provider which is not Nuvei (such as CreditGuard ect.) */ protected ApiExternalToken externalToken; diff --git a/src/main/java/com/safecharge/response/PayoutResponse.java b/src/main/java/com/nuvei/response/PayoutResponse.java similarity index 92% rename from src/main/java/com/safecharge/response/PayoutResponse.java rename to src/main/java/com/nuvei/response/PayoutResponse.java index d2f693c..8d284aa 100644 --- a/src/main/java/com/safecharge/response/PayoutResponse.java +++ b/src/main/java/com/nuvei/response/PayoutResponse.java @@ -1,22 +1,22 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.CardData; -import com.safecharge.model.MerchantDetails; +import com.nuvei.model.CardData; +import com.nuvei.model.MerchantDetails; /** *

* Response returned in result of payout method execution. * - * @author Bozhidar sHumanov - * @see payout + * @author Bozhidar sHumanov + * @see payout * @since 11/21/2017 */ -public class PayoutResponse extends SafechargeResponse { +public class PayoutResponse extends NuveiResponse { private String userTokenId; private String transactionStatus; diff --git a/src/main/java/com/safecharge/response/RefundTransactionResponse.java b/src/main/java/com/nuvei/response/RefundTransactionResponse.java similarity index 59% rename from src/main/java/com/safecharge/response/RefundTransactionResponse.java rename to src/main/java/com/nuvei/response/RefundTransactionResponse.java index abb3fd7..7f4daa0 100644 --- a/src/main/java/com/safecharge/response/RefundTransactionResponse.java +++ b/src/main/java/com/nuvei/response/RefundTransactionResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.RefundTransactionRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.RefundTransactionRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.RefundTransactionRequest + * @author Nikola Dichev + * @see com.nuvei.request.RefundTransactionRequest * @since 4/6/2017 */ -public class RefundTransactionResponse extends SafechargeTransactionResponse { +public class RefundTransactionResponse extends NuveiTransactionResponse { private String merchantAdviceCode; diff --git a/src/main/java/com/nuvei/response/SettleTransactionResponse.java b/src/main/java/com/nuvei/response/SettleTransactionResponse.java new file mode 100644 index 0000000..649396d --- /dev/null +++ b/src/main/java/com/nuvei/response/SettleTransactionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.SettleTransactionRequest}. + * + * @author Nikola Dichev + * @see com.nuvei.request.SettleTransactionRequest + * @since 4/6/2017 + */ +public class SettleTransactionResponse extends NuveiTransactionResponse { + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("SettleTransactionResponse{"); + sb.append(super.toString()); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/main/java/com/nuvei/response/SuspendUPOResponse.java b/src/main/java/com/nuvei/response/SuspendUPOResponse.java new file mode 100644 index 0000000..8ee4c7f --- /dev/null +++ b/src/main/java/com/nuvei/response/SuspendUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.SuspendUPORequest}. + * + * @author Bozhidar Shumanov + * @since 1/29/2018 + */ +public class SuspendUPOResponse extends NuveiResponse { + +} diff --git a/src/main/java/com/safecharge/response/ThreeDResponse.java b/src/main/java/com/nuvei/response/ThreeDResponse.java similarity index 97% rename from src/main/java/com/safecharge/response/ThreeDResponse.java rename to src/main/java/com/nuvei/response/ThreeDResponse.java index 3c15be3..8026c6c 100644 --- a/src/main/java/com/safecharge/response/ThreeDResponse.java +++ b/src/main/java/com/nuvei/response/ThreeDResponse.java @@ -1,11 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.Sdk; -import com.safecharge.model.SdkResponse; +import com.nuvei.model.SdkResponse; public class ThreeDResponse { diff --git a/src/main/java/com/safecharge/response/UpdateOrderResponse.java b/src/main/java/com/nuvei/response/UpdateOrderResponse.java similarity index 72% rename from src/main/java/com/safecharge/response/UpdateOrderResponse.java rename to src/main/java/com/nuvei/response/UpdateOrderResponse.java index 7ebc043..21009f4 100644 --- a/src/main/java/com/safecharge/response/UpdateOrderResponse.java +++ b/src/main/java/com/nuvei/response/UpdateOrderResponse.java @@ -1,18 +1,18 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; /** *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.UpdateOrderRequest}. + * Response received from the Nuvei's servers to the {@link com.nuvei.request.UpdateOrderRequest}. * - * @author Nikola Dichev - * @see com.safecharge.request.UpdateOrderRequest + * @author Nikola Dichev + * @see com.nuvei.request.UpdateOrderRequest * @since 2/15/2017 */ -public class UpdateOrderResponse extends SafechargeResponse implements SafechargeOrderResponse { +public class UpdateOrderResponse extends NuveiResponse implements NuveiOrderResponse { /** * Merchant Order ID to be used as input parameter in update method and payment methods. diff --git a/src/main/java/com/safecharge/response/UserResponse.java b/src/main/java/com/nuvei/response/UserResponse.java similarity index 52% rename from src/main/java/com/safecharge/response/UserResponse.java rename to src/main/java/com/nuvei/response/UserResponse.java index 6efcba2..7a272be 100644 --- a/src/main/java/com/safecharge/response/UserResponse.java +++ b/src/main/java/com/nuvei/response/UserResponse.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -public class UserResponse extends SafechargeResponse { +public class UserResponse extends NuveiResponse { private Long userId; diff --git a/src/main/java/com/safecharge/response/Verify3dResponse.java b/src/main/java/com/nuvei/response/Verify3dResponse.java similarity index 91% rename from src/main/java/com/safecharge/response/Verify3dResponse.java rename to src/main/java/com/nuvei/response/Verify3dResponse.java index 9a29bdb..fd9a2d3 100644 --- a/src/main/java/com/safecharge/response/Verify3dResponse.java +++ b/src/main/java/com/nuvei/response/Verify3dResponse.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.response; +package com.nuvei.response; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.PaymentOptionResponse; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.PaymentOptionResponse; -public class Verify3dResponse extends SafechargeResponse { +public class Verify3dResponse extends NuveiResponse { private String orderId; diff --git a/src/main/java/com/nuvei/response/VoidTransactionResponse.java b/src/main/java/com/nuvei/response/VoidTransactionResponse.java new file mode 100644 index 0000000..e1edbde --- /dev/null +++ b/src/main/java/com/nuvei/response/VoidTransactionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + */ + +package com.nuvei.response; + +/** + *

+ * Response received from the Nuvei's servers to the {@link com.nuvei.request.VoidTransactionRequest}. + * + * @author Nikola Dichev + * @see com.nuvei.request.VoidTransactionRequest + * @since 4/6/2017 + */ +public class VoidTransactionResponse extends NuveiTransactionResponse { + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("VoidTransactionResponse{"); + sb.append(super.toString()); + sb.append('}'); + return sb.toString(); + } +} diff --git a/src/main/java/com/safecharge/util/APIConstants.java b/src/main/java/com/nuvei/util/APIConstants.java similarity index 94% rename from src/main/java/com/safecharge/util/APIConstants.java rename to src/main/java/com/nuvei/util/APIConstants.java index 8eec0f1..cfae665 100644 --- a/src/main/java/com/safecharge/util/APIConstants.java +++ b/src/main/java/com/nuvei/util/APIConstants.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; import org.apache.http.Header; import org.apache.http.message.BasicHeader; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ public interface APIConstants { @@ -18,8 +18,8 @@ public interface APIConstants { * Use this enum instead of the String constants below. It provides better readability and easier maintenance. */ enum Environment { - PRODUCTION_HOST("https://secure.safecharge.com/ppp/"), - INTEGRATION_HOST("https://ppp-test.safecharge.com/ppp/"); + PRODUCTION_HOST("https://secure.nuvei.com/ppp/"), + INTEGRATION_HOST("https://ppp-test.nuvei.com/ppp/"); private String url; diff --git a/src/main/java/com/safecharge/util/AddressUtils.java b/src/main/java/com/nuvei/util/AddressUtils.java similarity index 96% rename from src/main/java/com/safecharge/util/AddressUtils.java rename to src/main/java/com/nuvei/util/AddressUtils.java index 46f5e51..2e8d5ab 100644 --- a/src/main/java/com/safecharge/util/AddressUtils.java +++ b/src/main/java/com/nuvei/util/AddressUtils.java @@ -1,17 +1,17 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.UserAddress; -import com.safecharge.model.UserDetails; -import com.safecharge.model.UserDetailsCashier; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.UserAddress; +import com.nuvei.model.UserDetails; +import com.nuvei.model.UserDetailsCashier; /** * - * @author Anton Antonov + * @author Anton Antonov * @since 19.09.2017 г. */ public class AddressUtils { diff --git a/src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java b/src/main/java/com/nuvei/util/AtLeastOneFieldPresent.java similarity index 95% rename from src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java rename to src/main/java/com/nuvei/util/AtLeastOneFieldPresent.java index aa3155d..50cd4a5 100644 --- a/src/main/java/com/safecharge/util/AtLeastOneFieldPresent.java +++ b/src/main/java/com/nuvei/util/AtLeastOneFieldPresent.java @@ -1,4 +1,4 @@ -package com.safecharge.util; +package com.nuvei.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java b/src/main/java/com/nuvei/util/AtLeastOneFieldPresentValidator.java similarity index 98% rename from src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java rename to src/main/java/com/nuvei/util/AtLeastOneFieldPresentValidator.java index 1936e2c..8d312f2 100644 --- a/src/main/java/com/safecharge/util/AtLeastOneFieldPresentValidator.java +++ b/src/main/java/com/nuvei/util/AtLeastOneFieldPresentValidator.java @@ -1,4 +1,4 @@ -package com.safecharge.util; +package com.nuvei.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/safecharge/util/CardUtils.java b/src/main/java/com/nuvei/util/CardUtils.java similarity index 87% rename from src/main/java/com/safecharge/util/CardUtils.java rename to src/main/java/com/nuvei/util/CardUtils.java index 3120eca..ae9eee3 100644 --- a/src/main/java/com/safecharge/util/CardUtils.java +++ b/src/main/java/com/nuvei/util/CardUtils.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.CardData; +import com.nuvei.model.CardData; /** * - * @author Anton Antonov + * @author Anton Antonov * @since 25.09.2017 г. */ public class CardUtils { diff --git a/src/main/java/com/safecharge/util/ChecksumUtils.java b/src/main/java/com/nuvei/util/ChecksumUtils.java similarity index 96% rename from src/main/java/com/safecharge/util/ChecksumUtils.java rename to src/main/java/com/nuvei/util/ChecksumUtils.java index c8eb852..fb607c4 100644 --- a/src/main/java/com/safecharge/util/ChecksumUtils.java +++ b/src/main/java/com/nuvei/util/ChecksumUtils.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; import java.lang.reflect.Field; import java.nio.ByteBuffer; @@ -22,10 +22,10 @@ /** *

- * Utility class used for calculating the Safecharge's request's checksum. Merchant key can be obtained by contacting - * SafeCharge’s Integration Team + * Utility class used for calculating the Nuvei's request's checksum. Merchant key can be obtained by contacting + * Nuvei’s Integration Team * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/21/2017 */ public class ChecksumUtils { @@ -115,7 +115,7 @@ private ChecksumUtils() { * Note that the {@code apiRequest} object needs to be properly annotated with {@link ValidChecksum} annotation. * * @param apiRequest The object containing the request to generate the checksum for - * @param key The merchant key obtained by Safecharge + * @param key The merchant key obtained by Nuvei * @param encoding The character encoding to use when calculating the checksum * @param hashAlgorithm The hash algorithm to use when calculating the checksum. Check {@link Constants.HashAlgorithm} * @return The calculated checksum as {@code String} or null if the checksum can not be calculated diff --git a/src/main/java/com/safecharge/util/Constants.java b/src/main/java/com/nuvei/util/Constants.java similarity index 98% rename from src/main/java/com/safecharge/util/Constants.java rename to src/main/java/com/nuvei/util/Constants.java index dba5a55..3eff020 100644 --- a/src/main/java/com/safecharge/util/Constants.java +++ b/src/main/java/com/nuvei/util/Constants.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/15/2017 */ public interface Constants { diff --git a/src/main/java/com/safecharge/util/DeviceUtils.java b/src/main/java/com/nuvei/util/DeviceUtils.java similarity index 74% rename from src/main/java/com/safecharge/util/DeviceUtils.java rename to src/main/java/com/nuvei/util/DeviceUtils.java index 13a06b0..2e583cc 100644 --- a/src/main/java/com/safecharge/util/DeviceUtils.java +++ b/src/main/java/com/nuvei/util/DeviceUtils.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.DeviceDetails; +import com.nuvei.model.DeviceDetails; /** * - * @author Anton Antonov + * @author Anton Antonov * @since 25.09.2017 г. */ public class DeviceUtils { diff --git a/src/main/java/com/safecharge/util/DynamicDescriptorUtils.java b/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java similarity index 74% rename from src/main/java/com/safecharge/util/DynamicDescriptorUtils.java rename to src/main/java/com/nuvei/util/DynamicDescriptorUtils.java index a702f39..9869142 100644 --- a/src/main/java/com/safecharge/util/DynamicDescriptorUtils.java +++ b/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.DynamicDescriptor; +import com.nuvei.model.DynamicDescriptor; public class DynamicDescriptorUtils { diff --git a/src/main/java/com/safecharge/util/MerchantUtils.java b/src/main/java/com/nuvei/util/MerchantUtils.java similarity index 89% rename from src/main/java/com/safecharge/util/MerchantUtils.java rename to src/main/java/com/nuvei/util/MerchantUtils.java index a96545d..c52ca88 100644 --- a/src/main/java/com/safecharge/util/MerchantUtils.java +++ b/src/main/java/com/nuvei/util/MerchantUtils.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.MerchantDetails; +import com.nuvei.model.MerchantDetails; /** * - * @author Anton Antonov + * @author Anton Antonov * @since 25.09.2017 г. */ public class MerchantUtils { diff --git a/src/main/java/com/safecharge/util/RequestUtils.java b/src/main/java/com/nuvei/util/RequestUtils.java similarity index 86% rename from src/main/java/com/safecharge/util/RequestUtils.java rename to src/main/java/com/nuvei/util/RequestUtils.java index 78b6c7b..424281f 100644 --- a/src/main/java/com/safecharge/util/RequestUtils.java +++ b/src/main/java/com/nuvei/util/RequestUtils.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -11,9 +11,9 @@ /** *

- * Utility class with helper methods for calculating some of the params needed when creating a request to Safecharge + * Utility class with helper methods for calculating some of the params needed when creating a request to Nuvei * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/17/2017 */ diff --git a/src/main/java/com/safecharge/util/UrlUtils.java b/src/main/java/com/nuvei/util/UrlUtils.java similarity index 72% rename from src/main/java/com/safecharge/util/UrlUtils.java rename to src/main/java/com/nuvei/util/UrlUtils.java index 8444057..8baf502 100644 --- a/src/main/java/com/safecharge/util/UrlUtils.java +++ b/src/main/java/com/nuvei/util/UrlUtils.java @@ -1,14 +1,14 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; -import com.safecharge.model.UrlDetails; +import com.nuvei.model.UrlDetails; /** * - * @author Anton Antonov + * @author Anton Antonov * @since 19.09.2017 г. */ public class UrlUtils { diff --git a/src/main/java/com/safecharge/util/ValidChecksum.java b/src/main/java/com/nuvei/util/ValidChecksum.java similarity index 76% rename from src/main/java/com/safecharge/util/ValidChecksum.java rename to src/main/java/com/nuvei/util/ValidChecksum.java index 0c165f1..f03a2c1 100644 --- a/src/main/java/com/safecharge/util/ValidChecksum.java +++ b/src/main/java/com/nuvei/util/ValidChecksum.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -13,7 +13,7 @@ *

* An annotation used to indicate that the target should be validated using the given {@link Constants.ChecksumOrderMapping} * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/21/2017 */ @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/safecharge/util/ValidationUtils.java b/src/main/java/com/nuvei/util/ValidationUtils.java similarity index 83% rename from src/main/java/com/safecharge/util/ValidationUtils.java rename to src/main/java/com/nuvei/util/ValidationUtils.java index f2f87c9..c6f5213 100644 --- a/src/main/java/com/safecharge/util/ValidationUtils.java +++ b/src/main/java/com/nuvei/util/ValidationUtils.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.util; +package com.nuvei.util; import java.util.Set; @@ -15,13 +15,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.safecharge.request.SafechargeBaseRequest; +import com.nuvei.request.NuveiBaseRequest; /** *

- * Utility class for validating the request to Safecharge + * Utility class for validating the request to Nuvei * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/24/2017 */ public class ValidationUtils { @@ -43,7 +43,7 @@ private ValidationUtils() { * @return The validated request(the same object passed as {@code request}) * @throws ValidationException if any {@link ConstraintViolation} is found */ - public static T validate(T request) throws ValidationException { + public static T validate(T request) throws ValidationException { Set> constraintViolations = validator.validate(request); diff --git a/src/main/java/com/safecharge/biz/ServiceFactory.java b/src/main/java/com/safecharge/biz/ServiceFactory.java deleted file mode 100644 index 08e2f72..0000000 --- a/src/main/java/com/safecharge/biz/ServiceFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.biz; - -import com.google.gson.GsonBuilder; - -public class ServiceFactory { - - public RequestBuilder getRequestBuilder() { - return new RequestBuilder(); - } -} diff --git a/src/main/java/com/safecharge/exception/SafechargeConfigurationException.java b/src/main/java/com/safecharge/exception/SafechargeConfigurationException.java deleted file mode 100644 index 2b05ca2..0000000 --- a/src/main/java/com/safecharge/exception/SafechargeConfigurationException.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.exception; - -/** - *

- * Wrapper class for exceptions due to configuration issues. - * - * @author Nikola Dichev - * @since 3/8/2017 - */ -public class SafechargeConfigurationException extends RuntimeException { - - public SafechargeConfigurationException() { - super(); - } - - public SafechargeConfigurationException(String message) { - super(message); - } - -} \ No newline at end of file diff --git a/src/main/java/com/safecharge/exception/SafechargeException.java b/src/main/java/com/safecharge/exception/SafechargeException.java deleted file mode 100644 index 3656725..0000000 --- a/src/main/java/com/safecharge/exception/SafechargeException.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.exception; - -public class SafechargeException extends Exception { - - public SafechargeException() { - } - - public SafechargeException(String message) { - super(message); - } -} diff --git a/src/main/java/com/safecharge/request/Dynamic3DRequest.java b/src/main/java/com/safecharge/request/Dynamic3DRequest.java deleted file mode 100644 index 007c95f..0000000 --- a/src/main/java/com/safecharge/request/Dynamic3DRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.request; - -import com.safecharge.util.Constants; -import com.safecharge.util.ValidChecksum; - -@ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) -public class Dynamic3DRequest extends Authorization3DRequest { - -} diff --git a/src/main/java/com/safecharge/response/Authorize3dResponse.java b/src/main/java/com/safecharge/response/Authorize3dResponse.java deleted file mode 100644 index e5c24f9..0000000 --- a/src/main/java/com/safecharge/response/Authorize3dResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the Safecharge's servers to the {@link com.safecharge.request.Authorize3dRequest} - *

- */ -public class Authorize3dResponse extends Authorize3dAndPaymentResponse { -} diff --git a/src/main/java/com/safecharge/response/CancelSubscriptionResponse.java b/src/main/java/com/safecharge/response/CancelSubscriptionResponse.java deleted file mode 100644 index bce6abe..0000000 --- a/src/main/java/com/safecharge/response/CancelSubscriptionResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.CancelSubscriptionRequest}. - * - * @author Nikola Dichev - * @see com.safecharge.request.CancelSubscriptionRequest - * @since 6/6/2017 - */ -public class CancelSubscriptionResponse extends SafechargeResponse { - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("CancelSubscriptionResponse{"); - sb.append(super.toString()); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/main/java/com/safecharge/response/DeleteUPOResponse.java b/src/main/java/com/safecharge/response/DeleteUPOResponse.java deleted file mode 100644 index f8eee84..0000000 --- a/src/main/java/com/safecharge/response/DeleteUPOResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.DeleteUPORequest}. - * - * @author Bozhidar Shumanov - * @since 1/29/2018 - */ -public class DeleteUPOResponse extends SafechargeResponse { - -} diff --git a/src/main/java/com/safecharge/response/Dynamic3DResponse.java b/src/main/java/com/safecharge/response/Dynamic3DResponse.java deleted file mode 100644 index 8e4eefd..0000000 --- a/src/main/java/com/safecharge/response/Dynamic3DResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -public class Dynamic3DResponse extends Authorization3DResponse { - -} diff --git a/src/main/java/com/safecharge/response/EditUPOAPMResponse.java b/src/main/java/com/safecharge/response/EditUPOAPMResponse.java deleted file mode 100644 index 1dfafb0..0000000 --- a/src/main/java/com/safecharge/response/EditUPOAPMResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.EditUPOAPMRequest}. - * - * @author Bozhidar Shumanov - * @since 1/29/2018 - */ -public class EditUPOAPMResponse extends SafechargeResponse { - -} diff --git a/src/main/java/com/safecharge/response/EnableUPOResponse.java b/src/main/java/com/safecharge/response/EnableUPOResponse.java deleted file mode 100644 index 152f13b..0000000 --- a/src/main/java/com/safecharge/response/EnableUPOResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.EnableUPORequest}. - * - * @author Bozhidar Shumanov - * @since 1/29/2018 - */ -public class EnableUPOResponse extends SafechargeResponse { - -} diff --git a/src/main/java/com/safecharge/response/GetSessionTokenResponse.java b/src/main/java/com/safecharge/response/GetSessionTokenResponse.java deleted file mode 100644 index 44ab0bd..0000000 --- a/src/main/java/com/safecharge/response/GetSessionTokenResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.GetSessionTokenRequest}. - * - * @author Nikola Dichev - * @see com.safecharge.request.GetSessionTokenRequest - * @since 2/15/2017 - */ -public class GetSessionTokenResponse extends SafechargeResponse { - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("GetSessionTokenResponse{"); - sb.append(super.toString()); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/main/java/com/safecharge/response/PaymentResponse.java b/src/main/java/com/safecharge/response/PaymentResponse.java deleted file mode 100644 index aadcf86..0000000 --- a/src/main/java/com/safecharge/response/PaymentResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the Safecharge's servers to the {@link com.safecharge.request.PaymentRequest} - *

- */ -public class PaymentResponse extends Authorize3dAndPaymentResponse { -} diff --git a/src/main/java/com/safecharge/response/SettleTransactionResponse.java b/src/main/java/com/safecharge/response/SettleTransactionResponse.java deleted file mode 100644 index 1997f44..0000000 --- a/src/main/java/com/safecharge/response/SettleTransactionResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.SettleTransactionRequest}. - * - * @author Nikola Dichev - * @see com.safecharge.request.SettleTransactionRequest - * @since 4/6/2017 - */ -public class SettleTransactionResponse extends SafechargeTransactionResponse { - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SettleTransactionResponse{"); - sb.append(super.toString()); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/main/java/com/safecharge/response/SuspendUPOResponse.java b/src/main/java/com/safecharge/response/SuspendUPOResponse.java deleted file mode 100644 index 32b6150..0000000 --- a/src/main/java/com/safecharge/response/SuspendUPOResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.SuspendUPORequest}. - * - * @author Bozhidar Shumanov - * @since 1/29/2018 - */ -public class SuspendUPOResponse extends SafechargeResponse { - -} diff --git a/src/main/java/com/safecharge/response/VoidTransactionResponse.java b/src/main/java/com/safecharge/response/VoidTransactionResponse.java deleted file mode 100644 index 294ba2d..0000000 --- a/src/main/java/com/safecharge/response/VoidTransactionResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.response; - -/** - *

- * Response received from the SafeCharge's servers to the {@link com.safecharge.request.VoidTransactionRequest}. - * - * @author Nikola Dichev - * @see com.safecharge.request.VoidTransactionRequest - * @since 4/6/2017 - */ -public class VoidTransactionResponse extends SafechargeTransactionResponse { - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("VoidTransactionResponse{"); - sb.append(super.toString()); - sb.append('}'); - return sb.toString(); - } -} diff --git a/src/test/java/com/safecharge/biz/SafechargeTest.java b/src/test/java/com/nuvei/biz/NuveiTest.java similarity index 75% rename from src/test/java/com/safecharge/biz/SafechargeTest.java rename to src/test/java/com/nuvei/biz/NuveiTest.java index ac20abb..1f62617 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/nuvei/biz/NuveiTest.java @@ -1,10 +1,8 @@ - - /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.biz; +package com.nuvei.biz; import javax.validation.ConstraintViolationException; @@ -16,39 +14,39 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.safecharge.exception.SafechargeConfigurationException; -import com.safecharge.exception.SafechargeException; -import com.safecharge.model.CardData; -import com.safecharge.model.RefundPaymentOption; -import com.safecharge.request.AccountCaptureRequest; -import com.safecharge.request.Authorize3dRequest; -import com.safecharge.request.CardDetailsRequest; -import com.safecharge.request.DccDetailsRequest; -import com.safecharge.request.GetPaymentStatusRequest; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.InitPaymentRequest; -import com.safecharge.request.McpRatesRequest; -import com.safecharge.request.OpenOrderRequest; -import com.safecharge.request.PaymentRequest; -import com.safecharge.request.RefundTransactionRequest; -import com.safecharge.request.SettleTransactionRequest; -import com.safecharge.request.Verify3dRequest; -import com.safecharge.request.VoidTransactionRequest; -import com.safecharge.response.AccountCaptureResponse; -import com.safecharge.response.Authorize3dResponse; -import com.safecharge.response.CardDetailsResponse; -import com.safecharge.response.DccDetailsResponse; -import com.safecharge.response.GetPaymentStatusResponse; -import com.safecharge.response.InitPaymentResponse; -import com.safecharge.response.McpRatesResponse; -import com.safecharge.response.OpenOrderResponse; -import com.safecharge.response.PaymentResponse; -import com.safecharge.response.RefundTransactionResponse; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.response.SettleTransactionResponse; -import com.safecharge.response.Verify3dResponse; -import com.safecharge.response.VoidTransactionResponse; -import com.safecharge.util.Constants; +import com.nuvei.exception.NuveiConfigurationException; +import com.nuvei.exception.NuveiException; +import com.nuvei.model.CardData; +import com.nuvei.model.RefundPaymentOption; +import com.nuvei.request.AccountCaptureRequest; +import com.nuvei.request.Authorize3dRequest; +import com.nuvei.request.CardDetailsRequest; +import com.nuvei.request.DccDetailsRequest; +import com.nuvei.request.GetPaymentStatusRequest; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.InitPaymentRequest; +import com.nuvei.request.McpRatesRequest; +import com.nuvei.request.OpenOrderRequest; +import com.nuvei.request.PaymentRequest; +import com.nuvei.request.RefundTransactionRequest; +import com.nuvei.request.SettleTransactionRequest; +import com.nuvei.request.Verify3dRequest; +import com.nuvei.request.VoidTransactionRequest; +import com.nuvei.response.AccountCaptureResponse; +import com.nuvei.response.Authorize3dResponse; +import com.nuvei.response.CardDetailsResponse; +import com.nuvei.response.DccDetailsResponse; +import com.nuvei.response.GetPaymentStatusResponse; +import com.nuvei.response.InitPaymentResponse; +import com.nuvei.response.McpRatesResponse; +import com.nuvei.response.OpenOrderResponse; +import com.nuvei.response.PaymentResponse; +import com.nuvei.response.RefundTransactionResponse; +import com.nuvei.response.NuveiResponse; +import com.nuvei.response.SettleTransactionResponse; +import com.nuvei.response.Verify3dResponse; +import com.nuvei.response.VoidTransactionResponse; +import com.nuvei.util.Constants; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.any; @@ -57,27 +55,26 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; - -public class SafechargeTest { +public class NuveiTest { @Mock - private SafechargeRequestExecutor executor; + private NuveiRequestExecutor executor; @Rule public ExpectedException exception = ExpectedException.none(); @InjectMocks - private Safecharge sut; + private Nuvei sut; @Before public void setUp() throws Exception { - sut = new Safecharge(); + sut = new Nuvei(); MockitoAnnotations.initMocks(this); } @Test - public void shouldCorrectlyInitializeMerchantInfo() throws SafechargeException { - SafechargeResponse response = mock(SafechargeResponse.class); + public void shouldCorrectlyInitializeMerchantInfo() throws NuveiException { + NuveiResponse response = mock(NuveiResponse.class); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(response); @@ -88,25 +85,25 @@ public void shouldCorrectlyInitializeMerchantInfo() throws SafechargeException { } @Test - public void shouldThrowExceptionWithGivenReasonWhenResponseStatusIsError() throws SafechargeException { - SafechargeResponse response = mock(SafechargeResponse.class); + public void shouldThrowExceptionWithGivenReasonWhenResponseStatusIsError() throws NuveiException { + NuveiResponse response = mock(NuveiResponse.class); when(response.getStatus()).thenReturn(Constants.APIResponseStatus.ERROR); when(response.getReason()).thenReturn("Invalid data."); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(response); - exception.expect(SafechargeConfigurationException.class); + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Invalid data."); sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); } @Test - public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecutePaymentRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse paymentResponse = new PaymentResponse(); + NuveiResponse paymentResponse = new PaymentResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(PaymentRequest.class))).thenReturn(paymentResponse); @@ -126,8 +123,8 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeExce } @Test - public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, @@ -137,11 +134,11 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque } @Test - public void shouldExecuteInitPaymentRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteInitPaymentRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse initPaymentResponse = new InitPaymentResponse(); + NuveiResponse initPaymentResponse = new InitPaymentResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(InitPaymentRequest.class))).thenReturn(initPaymentResponse); @@ -159,8 +156,8 @@ public void shouldExecuteInitPaymentRequestAndReturnResponse() throws Safecharge } @Test - public void shouldThrowExceptionWhenInitPaymentRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenInitPaymentRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.initPayment("userTokenId", "clientUniqueId", "clientRequestId", "BGN", "11", @@ -168,11 +165,11 @@ public void shouldThrowExceptionWhenInitPaymentRequestIsExecutedWithoutInitializ } @Test - public void shouldExecuteOpenOrderRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteOpenOrderRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse openOrderResponse = new OpenOrderResponse(); + NuveiResponse openOrderResponse = new OpenOrderResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(OpenOrderRequest.class))).thenReturn(openOrderResponse); @@ -192,8 +189,8 @@ public void shouldExecuteOpenOrderRequestAndReturnResponse() throws SafechargeEx } @Test - public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, @@ -203,11 +200,11 @@ public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeR } @Test - public void shouldExecuteGetPaymentStatusRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteGetPaymentStatusRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse getPaymentStatusResponse = new GetPaymentStatusResponse(); + NuveiResponse getPaymentStatusResponse = new GetPaymentStatusResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(GetPaymentStatusRequest.class))).thenReturn(getPaymentStatusResponse); @@ -224,19 +221,19 @@ public void shouldExecuteGetPaymentStatusRequestAndReturnResponse() throws Safec } @Test - public void shouldThrowExceptionWhenGetPaymentStatusRequestIsExecutedWithoutInitializeRequstBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenGetPaymentStatusRequestIsExecutedWithoutInitializeRequstBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.getPaymentStatus(); } @Test - public void shouldExecuteVoidTransactionRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteVoidTransactionRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse voidTransactionResponse = new VoidTransactionResponse(); + NuveiResponse voidTransactionResponse = new VoidTransactionResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(VoidTransactionRequest.class))).thenReturn(voidTransactionResponse); @@ -254,8 +251,8 @@ public void shouldExecuteVoidTransactionRequestAndReturnResponse() throws Safech } @Test - public void shouldThrowExceptionWhenVoidTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenVoidTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.voidTransaction("clientRequestId", "relatedTransactionId", "11", "BGN", "authCode", @@ -263,11 +260,11 @@ public void shouldThrowExceptionWhenVoidTransactionRequestIsExecutedWithoutIniti } @Test - public void shouldExecuteSettleTransactionRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteSettleTransactionRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse settleTransactionResponse = new SettleTransactionResponse(); + NuveiResponse settleTransactionResponse = new SettleTransactionResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(SettleTransactionRequest.class))).thenReturn(settleTransactionResponse); @@ -285,8 +282,8 @@ public void shouldExecuteSettleTransactionRequestAndReturnResponse() throws Safe } @Test - public void shouldThrowExceptionWhenSettleTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenSettleTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.settleTransaction("clientUniqueId", "clientRequestId", null, null, null, null, "11", @@ -294,11 +291,11 @@ public void shouldThrowExceptionWhenSettleTransactionRequestIsExecutedWithoutIni } @Test - public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse refundTransactionResponse = new RefundTransactionResponse(); + NuveiResponse refundTransactionResponse = new RefundTransactionResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(RefundTransactionRequest.class))).thenReturn(refundTransactionResponse); @@ -316,11 +313,11 @@ public void shouldExecuteRefundTransactionRequestAndReturnResponse() throws Safe } @Test - public void shouldExecuteUnreferencedRefundTransactionRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteUnreferencedRefundTransactionRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse refundTransactionResponse = new RefundTransactionResponse(); + NuveiResponse refundTransactionResponse = new RefundTransactionResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(RefundTransactionRequest.class))).thenReturn(refundTransactionResponse); @@ -341,8 +338,8 @@ public void shouldExecuteUnreferencedRefundTransactionRequestAndReturnResponse() } @Test - public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.refundTransaction("clientUniqueId", "clientRequestId", null, "11", "authCode", null, "BGN", @@ -350,11 +347,11 @@ public void shouldThrowExceptionWhenRefundTransactionRequestIsExecutedWithoutIni } @Test - public void shouldExecuteVerify3dRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteVerify3dRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse verify3dResponse = new Verify3dResponse(); + NuveiResponse verify3dResponse = new Verify3dResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(Verify3dRequest.class))).thenReturn(verify3dResponse); @@ -372,8 +369,8 @@ public void shouldExecuteVerify3dRequestAndReturnResponse() throws SafechargeExc } @Test - public void shouldThrowExceptionWhenVerify3dRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenVerify3dRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.verify3d("clientUniqueId", "clienRequestId", "11", "BGN", null, null, null, null, @@ -381,11 +378,11 @@ public void shouldThrowExceptionWhenVerify3dRequestIsExecutedWithoutInitializeRe } @Test - public void shouldExecuteAuthorize3dRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteAuthorize3dRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse authorize3dResponse = new Authorize3dResponse(); + NuveiResponse authorize3dResponse = new Authorize3dResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(Authorize3dRequest.class))).thenReturn(authorize3dResponse); @@ -405,8 +402,8 @@ public void shouldExecuteAuthorize3dRequestAndReturnResponse() throws Safecharge } @Test - public void shouldThrowExceptionWhenAuthorize3dRequestIsExecutedWithouthInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenAuthorize3dRequestIsExecutedWithouthInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.authorize3d("usertTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", @@ -416,11 +413,11 @@ public void shouldThrowExceptionWhenAuthorize3dRequestIsExecutedWithouthInitiali } @Test - public void shouldExecuteGetGardDetailsRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteGetGardDetailsRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse getCardDetailsResponse = new CardDetailsResponse(); + NuveiResponse getCardDetailsResponse = new CardDetailsResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(CardDetailsRequest.class))).thenReturn(getCardDetailsResponse); @@ -437,19 +434,19 @@ public void shouldExecuteGetGardDetailsRequestAndReturnResponse() throws Safecha } @Test - public void shouldThrowExceptionWhenGetCardDetailsRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenGetCardDetailsRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.getCardDetails(null, null, "123456"); } @Test - public void shouldExecuteGetDccDetailsRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteGetDccDetailsRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse dccDetailsResponse = new DccDetailsResponse(); + NuveiResponse dccDetailsResponse = new DccDetailsResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(DccDetailsRequest.class))).thenReturn(dccDetailsResponse); @@ -467,8 +464,8 @@ public void shouldExecuteGetDccDetailsRequestAndReturnResponse() throws Safechar } @Test - public void shouldThrowExceptionWhenGetDccDetailsRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenGetDccDetailsRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.getDccDetails("clientUniqueId", "clentRequestId", "123456", null, "10", @@ -476,11 +473,11 @@ public void shouldThrowExceptionWhenGetDccDetailsRequestIsExecutedWithoutInitial } @Test - public void shouldExecuteGetMcpRatesRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteGetMcpRatesRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse mcpRatesRequest = new McpRatesResponse(); + NuveiResponse mcpRatesRequest = new McpRatesResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(McpRatesRequest.class))).thenReturn(mcpRatesRequest); @@ -497,19 +494,19 @@ public void shouldExecuteGetMcpRatesRequestAndReturnResponse() throws Safecharge } @Test - public void shouldThrowExceptionWhenGetMcpRatesRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenGetMcpRatesRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.getMcpRates("clientUniqueId", "clentRequestId", "BGN", null, null); } @Test - public void shouldExecuteAccountCaptureRequestAndReturnResponse() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldExecuteAccountCaptureRequestAndReturnResponse() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); - SafechargeResponse accountCaptureResponse = new AccountCaptureResponse(); + NuveiResponse accountCaptureResponse = new AccountCaptureResponse(); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); when(executor.execute(any(AccountCaptureRequest.class))).thenReturn(accountCaptureResponse); @@ -527,8 +524,8 @@ public void shouldExecuteAccountCaptureRequestAndReturnResponse() throws Safecha } @Test - public void shouldThrowExceptionWhenAccountCaptureRequestIsExecutedWithoutInitializeRequestBeforehand() throws SafechargeException { - exception.expect(SafechargeConfigurationException.class); + public void shouldThrowExceptionWhenAccountCaptureRequestIsExecutedWithoutInitializeRequestBeforehand() throws NuveiException { + exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.accountCapture("clientRequestId", "userTokenId", "paymentMethod", "BGN", "BG", @@ -536,8 +533,8 @@ public void shouldThrowExceptionWhenAccountCaptureRequestIsExecutedWithoutInitia } @Test - public void shouldThrowExceptionIfARequestIsExecutedWithoutSomeMandatoryField() throws SafechargeException { - SafechargeResponse sessionResponse = mock(SafechargeResponse.class); + public void shouldThrowExceptionIfARequestIsExecutedWithoutSomeMandatoryField() throws NuveiException { + NuveiResponse sessionResponse = mock(NuveiResponse.class); when(sessionResponse.getSessionToken()).thenReturn("sessionToken"); when(executor.execute(any(GetSessionTokenRequest.class))).thenReturn(sessionResponse); diff --git a/src/test/java/com/safecharge/test/BaseTest.java b/src/test/java/com/nuvei/test/BaseTest.java similarity index 56% rename from src/test/java/com/safecharge/test/BaseTest.java rename to src/test/java/com/nuvei/test/BaseTest.java index 13dc0a6..1defe90 100644 --- a/src/test/java/com/safecharge/test/BaseTest.java +++ b/src/test/java/com/nuvei/test/BaseTest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test; +package com.nuvei.test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,29 +15,28 @@ import javax.validation.ValidationException; import javax.validation.Validator; -import com.safecharge.request.*; -import com.safecharge.response.*; +import com.nuvei.request.*; +import com.nuvei.response.*; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; -import org.mockito.Mock; import org.mockito.Mockito; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.safecharge.biz.SafechargeRequestExecutor; -import com.safecharge.util.ValidationUtils; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.util.ValidationUtils; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/28/2017 */ public abstract class BaseTest { protected static Validator validator; protected static Gson gson; - protected SafechargeRequestExecutor safechargeRequestExecutor; + protected NuveiRequestExecutor nuveiRequestExecutor; @BeforeClass public static void setup() { @@ -48,102 +47,102 @@ public static void setup() { @Before public void init() { - safechargeRequestExecutor = mock(SafechargeRequestExecutor.class); + nuveiRequestExecutor = mock(NuveiRequestExecutor.class); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetSessionTokenRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetSessionTokenRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/getSessionToken.json"), GetSessionTokenResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetOrderDetailsRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetOrderDetailsRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/getOrderDetails.json"), GetOrderDetailsResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(OpenOrderRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(OpenOrderRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/openOrder.json"), OpenOrderResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(UpdateOrderRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(UpdateOrderRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/updateOrder.json"), UpdateOrderResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(PaymentAPMRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(PaymentAPMRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/paymentAPM.json"), PaymentAPMResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(PaymentCCRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(PaymentCCRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/paymentCC.json"), PaymentCCResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(Payment3DRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(Payment3DRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/payment3D.json"), Payment3DResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(Authorization3DRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(Authorization3DRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/authorization3D.json"), Authorization3DResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(Dynamic3DRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(Dynamic3DRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/authorization3D.json"), Dynamic3DResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardByTempTokenRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardByTempTokenRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/addUPOCreditCardByTempToken.json"), AddUPOCreditCardByTempTokenResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(CardTokenizationRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(CardTokenizationRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/cardTokenization.json"), CardTokenizationResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/addUPOCreditCard.json"), AddUPOCreditCardResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(AddUPOAPMRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(AddUPOAPMRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/addUPOAPM.json"), AddUPOAPMResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(SettleTransactionRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(SettleTransactionRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/settleTransaction.json"), SettleTransactionResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(RefundTransactionRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(RefundTransactionRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/refundTransaction.json"), RefundTransactionResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(VoidTransactionRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(VoidTransactionRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/voidTransaction.json"), VoidTransactionResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetMerchantPaymentMethodsRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetMerchantPaymentMethodsRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/getMerchantPaymentMethods.json"), GetMerchantPaymentMethodsResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(PayoutRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(PayoutRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/payout.json"), PayoutResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(CreateUserRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(CreateUserRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/userActionResponse.json"), UserResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(UpdateUserRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(UpdateUserRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/userActionResponse.json"), UserResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetUserDetailsRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetUserDetailsRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/getUserDetails.json"), GetUserDetailsResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardByTokenRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(AddUPOCreditCardByTokenRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/addUPOCreditCardByToken.json"), AddUPOCreditCardByTokenResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetUserUPOsRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetUserUPOsRequest.class))).thenReturn( gson.fromJson(loadResourceFile("./mock/response/getUserUPOs.json"), GetUserUPOsResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(EditUPOCreditCardRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(EditUPOCreditCardRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/editUPOCreditCard.json"), EditUPOCreditCardResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(EditUPOAPMRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(EditUPOAPMRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/editUPOAPM.json"), EditUPOAPMResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(EnableUPORequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(EnableUPORequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/basicEditUPO.json"), EnableUPOResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(DeleteUPORequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(DeleteUPORequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/basicEditUPO.json"), DeleteUPOResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(SuspendUPORequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(SuspendUPORequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/basicEditUPO.json"), SuspendUPOResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(PaymentRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(PaymentRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/payment.json"), PaymentResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(InitPaymentRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(InitPaymentRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/initPayment.json"), InitPaymentResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetPaymentStatusRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetPaymentStatusRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/getPaymentStatus.json"), GetPaymentStatusResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(Verify3dRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(Verify3dRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/verify3d.json"), Verify3dResponse.class)); - when(safechargeRequestExecutor.executeRequest(Mockito.any(CardDetailsRequest.class))).thenReturn( + when(nuveiRequestExecutor.executeRequest(Mockito.any(CardDetailsRequest.class))).thenReturn( gson.fromJson(loadResourceFile("mock/response/cardDetails.json"), CardDetailsResponse.class)); } @@ -164,7 +163,7 @@ protected String loadResourceFile(String path) { } } - protected void validateRequest(SafechargeBaseRequest request) { + protected void validateRequest(NuveiBaseRequest request) { try { ValidationUtils.validate(request); } catch (ValidationException e) { @@ -172,7 +171,7 @@ protected void validateRequest(SafechargeBaseRequest request) { } } - protected T baseMockTest(String jsonPath, Class requestClass) { + protected T baseMockTest(String jsonPath, Class requestClass) { T response = baseMockTestMethodWithoutSessionToken(jsonPath, requestClass); Assert.assertTrue(defined(response.getSessionToken())); @@ -180,20 +179,20 @@ protected T baseMockTest(String jsonPath, Class T baseMockTestMethodWithPrebuiltObjectWithoutSession(SafechargeBaseRequest request) { + protected T baseMockTestMethodWithPrebuiltObjectWithoutSession(NuveiBaseRequest request) { return executeAndValidateResponse(request); } - protected T baseMockTestMethodWithoutSessionToken(String jsonPath, Class requestClass) { - SafechargeBaseRequest request = gson.fromJson(loadResourceFile(jsonPath), requestClass); + protected T baseMockTestMethodWithoutSessionToken(String jsonPath, Class requestClass) { + NuveiBaseRequest request = gson.fromJson(loadResourceFile(jsonPath), requestClass); validateRequest(request); return executeAndValidateResponse(request); } - private T executeAndValidateResponse(SafechargeBaseRequest request) { - T response = (T) safechargeRequestExecutor.executeRequest(request); + private T executeAndValidateResponse(NuveiBaseRequest request) { + T response = (T) nuveiRequestExecutor.executeRequest(request); Assert.assertTrue(response != null); Assert.assertTrue(defined(response.getMerchantId())); diff --git a/src/test/java/com/safecharge/test/ValidationsTest.java b/src/test/java/com/nuvei/test/ValidationsTest.java similarity index 86% rename from src/test/java/com/safecharge/test/ValidationsTest.java rename to src/test/java/com/nuvei/test/ValidationsTest.java index d2e1035..52f048e 100644 --- a/src/test/java/com/safecharge/test/ValidationsTest.java +++ b/src/test/java/com/nuvei/test/ValidationsTest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test; +package com.nuvei.test; import java.util.ArrayList; import java.util.HashMap; @@ -16,57 +16,57 @@ import org.junit.Before; import org.junit.Test; -import com.safecharge.model.CardData; -import com.safecharge.model.DynamicDescriptor; -import com.safecharge.model.Item; -import com.safecharge.model.MerchantBaseInfo; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.MerchantInfo; -import com.safecharge.model.RestApiUserDetails; -import com.safecharge.model.SubMerchant; -import com.safecharge.model.SubMethodDetails; -import com.safecharge.model.UrlDetails; -import com.safecharge.model.UserAddress; -import com.safecharge.request.AccountCaptureRequest; -import com.safecharge.request.AddUPOAPMRequest; -import com.safecharge.request.AddUPOCreditCardByTempTokenRequest; -import com.safecharge.request.AddUPOCreditCardByTokenRequest; -import com.safecharge.request.AddUPOCreditCardRequest; -import com.safecharge.request.Authorization3DRequest; -import com.safecharge.request.CancelSubscriptionRequest; -import com.safecharge.request.CardDetailsRequest; -import com.safecharge.request.CardTokenizationRequest; -import com.safecharge.request.CreateSubscriptionRequest; -import com.safecharge.request.DccDetailsRequest; -import com.safecharge.request.DeleteUPORequest; -import com.safecharge.request.EditUPOAPMRequest; -import com.safecharge.request.EditUPOCreditCardRequest; -import com.safecharge.request.EnableUPORequest; -import com.safecharge.request.GetMerchantPaymentMethodsRequest; -import com.safecharge.request.GetOrderDetailsRequest; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.GetSubscriptionPlansRequest; -import com.safecharge.request.GetSubscriptionsListRequest; -import com.safecharge.request.GetUserUPOsRequest; -import com.safecharge.request.McpRatesRequest; -import com.safecharge.request.OpenOrderRequest; -import com.safecharge.request.Payment3DRequest; -import com.safecharge.request.PaymentAPMRequest; -import com.safecharge.request.PaymentCCRequest; -import com.safecharge.request.PayoutRequest; -import com.safecharge.request.RefundTransactionRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.SettleTransactionRequest; -import com.safecharge.request.SuspendUPORequest; -import com.safecharge.request.UpdateOrderRequest; -import com.safecharge.request.Verify3dRequest; -import com.safecharge.request.VoidTransactionRequest; -import com.safecharge.request.basic.EditUPOBasicRequest; -import com.safecharge.util.AddressUtils; -import com.safecharge.util.Constants; -import com.safecharge.util.DynamicDescriptorUtils; -import com.safecharge.util.MerchantUtils; -import com.safecharge.util.UrlUtils; +import com.nuvei.model.CardData; +import com.nuvei.model.DynamicDescriptor; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantBaseInfo; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.MerchantInfo; +import com.nuvei.model.RestApiUserDetails; +import com.nuvei.model.SubMerchant; +import com.nuvei.model.SubMethodDetails; +import com.nuvei.model.UrlDetails; +import com.nuvei.model.UserAddress; +import com.nuvei.request.AccountCaptureRequest; +import com.nuvei.request.AddUPOAPMRequest; +import com.nuvei.request.AddUPOCreditCardByTempTokenRequest; +import com.nuvei.request.AddUPOCreditCardByTokenRequest; +import com.nuvei.request.AddUPOCreditCardRequest; +import com.nuvei.request.Authorization3DRequest; +import com.nuvei.request.CancelSubscriptionRequest; +import com.nuvei.request.CardDetailsRequest; +import com.nuvei.request.CardTokenizationRequest; +import com.nuvei.request.CreateSubscriptionRequest; +import com.nuvei.request.DccDetailsRequest; +import com.nuvei.request.DeleteUPORequest; +import com.nuvei.request.EditUPOAPMRequest; +import com.nuvei.request.EditUPOCreditCardRequest; +import com.nuvei.request.EnableUPORequest; +import com.nuvei.request.GetMerchantPaymentMethodsRequest; +import com.nuvei.request.GetOrderDetailsRequest; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.GetSubscriptionPlansRequest; +import com.nuvei.request.GetSubscriptionsListRequest; +import com.nuvei.request.GetUserUPOsRequest; +import com.nuvei.request.McpRatesRequest; +import com.nuvei.request.OpenOrderRequest; +import com.nuvei.request.Payment3DRequest; +import com.nuvei.request.PaymentAPMRequest; +import com.nuvei.request.PaymentCCRequest; +import com.nuvei.request.PayoutRequest; +import com.nuvei.request.RefundTransactionRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.SettleTransactionRequest; +import com.nuvei.request.SuspendUPORequest; +import com.nuvei.request.UpdateOrderRequest; +import com.nuvei.request.Verify3dRequest; +import com.nuvei.request.VoidTransactionRequest; +import com.nuvei.request.basic.EditUPOBasicRequest; +import com.nuvei.util.AddressUtils; +import com.nuvei.util.Constants; +import com.nuvei.util.DynamicDescriptorUtils; +import com.nuvei.util.MerchantUtils; +import com.nuvei.util.UrlUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -75,7 +75,7 @@ /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/24/2017 */ public class ValidationsTest { @@ -263,13 +263,13 @@ private void commonFailedValidationEnableUPORequest(Constants.EditUpoBuilderType @Test public void testSuccessfulValidation_AddUPOAPMRequest() { - SafechargeBaseRequest safechargeRequest = AddUPOAPMRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOAPMRequest.builder() .addMerchantInfo(validMerchantInfo) .addApmData(dummyValidApmData) .addUserTokenId(dummyUserId) .addPaymentMethodName(dummyPaymentMethodName) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -290,19 +290,19 @@ public void testFailedValidation_AddUPOAPMRequest() { @Test public void testSuccessfulValidation_AddUPOCreditCardByTempTokenRequest() { - SafechargeBaseRequest safechargeRequest = AddUPOCreditCardByTempTokenRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOCreditCardByTempTokenRequest.builder() .addMerchantInfo(validMerchantInfo) .addCCTempToken(dummyCcToken) .addUserTokenId(dummyUserId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test public void testFailedValidation_AddUPOCreditCardByTempTokenRequest() { try { - SafechargeBaseRequest safechargeRequest = AddUPOCreditCardByTempTokenRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOCreditCardByTempTokenRequest.builder() .addMerchantInfo(invalidMerchantInfo) .build(); } catch (ConstraintViolationException e) { @@ -313,7 +313,7 @@ public void testFailedValidation_AddUPOCreditCardByTempTokenRequest() { @Test public void testSuccessfulValidation_AddUPOCreditCardRequest() { - SafechargeBaseRequest safechargeRequest = AddUPOCreditCardRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOCreditCardRequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addCcCardNumber(dummyCcCardNumber) @@ -323,7 +323,7 @@ public void testSuccessfulValidation_AddUPOCreditCardRequest() { .addBillingAddress(dummyFirstName, dummyLastName, dummyAddress, dummyPhone, dummyZip, dummyCity, dummyCountryCode, dummyState, dummyEMail, dummyLocale, dummyBirthDate, dummyCountry) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -342,7 +342,7 @@ public void testFailedValidation_AddUPOCreditCardRequest() { @Test public void testSuccessfulValidation_Authorization3DRequest() { - SafechargeBaseRequest safechargeRequest = Authorization3DRequest.builder() + NuveiBaseRequest nuveiRequest = Authorization3DRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addIsDynamic3D("0", "off") @@ -350,7 +350,7 @@ public void testSuccessfulValidation_Authorization3DRequest() { .addCurrency(validCurrencyCode) .addItem(dummyValidItem) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -370,12 +370,12 @@ public void testFailedValidation_Authorization3DRequest() { @Test public void testSuccessfulValidation_CancelSubscriptionRequest() { - SafechargeBaseRequest safechargeRequest = CancelSubscriptionRequest.builder() + NuveiBaseRequest nuveiRequest = CancelSubscriptionRequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addSubscriptionId("1234") .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -394,11 +394,11 @@ public void testFailedValidation_CancelSubscriptionRequest() { @Test public void testSuccessfulValidation_CardTokenizationRequest() { - SafechargeBaseRequest safechargeRequest = CardTokenizationRequest.builder() + NuveiBaseRequest nuveiRequest = CardTokenizationRequest.builder() .addMerchantInfo(validBaseMerchantInfo) .addCardData(dummyCardData) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -418,7 +418,7 @@ public void testFailedValidation_CardTokenizationRequest() { @Test public void testSuccessfulValidation_CreateSubscriptionRequest() { - SafechargeBaseRequest safechargeRequest = CreateSubscriptionRequest.builder() + NuveiBaseRequest nuveiRequest = CreateSubscriptionRequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addSubscriptionPlanId(dummySubscriptionPlanId) @@ -432,7 +432,7 @@ public void testSuccessfulValidation_CreateSubscriptionRequest() { .addURLDetails("failureUrl", "pendingUrl", "successUrl", "notificationUrl") .addUserPaymentOption("cvv", "111111") .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -481,14 +481,14 @@ public void testFailedValidationForInitialTransactionId_CreateSubscriptionReques @Test public void testSuccessfulValidation_GetMerchantPaymentMethodsRequest() { - SafechargeBaseRequest safechargeRequest = GetMerchantPaymentMethodsRequest.builder() + NuveiBaseRequest nuveiRequest = GetMerchantPaymentMethodsRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addCountryCode(validCountryCode) .addLanguageCode(validLanguageCode) .addCurrencyCode(validCurrencyCode) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -510,12 +510,12 @@ public void testFailedValidation_GetMerchantPaymentMethodsRequest() { @Test public void testSuccessfulValidation_GetOrderDetailsRequest() { - SafechargeBaseRequest safechargeRequest = GetOrderDetailsRequest.builder() + NuveiBaseRequest nuveiRequest = GetOrderDetailsRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addOrderId(dummyOrderId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -534,10 +534,10 @@ public void testFailedValidation_GetOrderDetailsRequest() { @Test public void testSuccessfulValidation_GetSessionToken() { - SafechargeBaseRequest safechargeRequest = GetSessionTokenRequest.builder() + NuveiBaseRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(validMerchantInfo) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -556,10 +556,10 @@ public void testFailedValidation_GetSessionToken() { @Test public void testSuccessfulValidation_GetSubscriptionPlansRequest() { - SafechargeBaseRequest safechargeRequest = GetSubscriptionPlansRequest.builder() + NuveiBaseRequest nuveiRequest = GetSubscriptionPlansRequest.builder() .addMerchantInfo(validMerchantInfo) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -579,10 +579,10 @@ public void testFailedValidation_GetSubscriptionPlansRequest() { @Test public void testSuccessfulValidation_GetSubscriptionsListRequest() { - SafechargeBaseRequest safechargeRequest = GetSubscriptionsListRequest.builder() + NuveiBaseRequest nuveiRequest = GetSubscriptionsListRequest.builder() .addMerchantInfo(validMerchantInfo) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -601,21 +601,21 @@ public void testFailedValidation_GetSubscriptionsListRequest() { @Test public void testSuccessfulValidation_OpenOrderRequest() { - SafechargeBaseRequest safechargeRequest = OpenOrderRequest.builder() + NuveiBaseRequest nuveiRequest = OpenOrderRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addCurrency(validCurrencyCode) .addAmount(validAmount) .addItem(dummyValidItem) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test public void testFailedValidation_OpenOrderRequest() { try { - SafechargeBaseRequest safechargeRequest = OpenOrderRequest.builder() + NuveiBaseRequest nuveiRequest = OpenOrderRequest.builder() .addMerchantInfo(invalidMerchantInfo) .addAmount(invalidAmount) .addCurrency(invalidCurrencyCode) @@ -631,14 +631,14 @@ public void testFailedValidation_OpenOrderRequest() { @Test public void testSuccessfulValidation_Payment3DRequest() { - SafechargeBaseRequest safechargeRequest = Payment3DRequest.builder() + NuveiBaseRequest nuveiRequest = Payment3DRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addAmount(validAmount) .addCurrency(validCurrencyCode) .addItem(dummyValidItem) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -657,7 +657,7 @@ public void testFailedValidation_Payment3DRequest() { @Test public void testSuccessfulValidation_PaymentAPMRequest() { - SafechargeBaseRequest safechargeRequest = PaymentAPMRequest.builder() + NuveiBaseRequest nuveiRequest = PaymentAPMRequest.builder() .addMerchantInfo(validMerchantInfo) .addCurrency(validCurrencyCode) .addAmount(validAmountTwoItems) @@ -671,12 +671,12 @@ public void testSuccessfulValidation_PaymentAPMRequest() { .addURLDetails(dummyValidUrlDetails) .addPaymentMethod(validPaymentMethodName) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test public void testSuccessfulValidation_withAddressLines_PaymentAPMRequest() { - SafechargeBaseRequest safechargeRequest = PaymentAPMRequest.builder() + NuveiBaseRequest nuveiRequest = PaymentAPMRequest.builder() .addMerchantInfo(validMerchantInfo) .addCurrency(validCurrencyCode) .addAmount(validAmountTwoItems) @@ -690,7 +690,7 @@ public void testSuccessfulValidation_withAddressLines_PaymentAPMRequest() { .addURLDetails(dummyValidUrlDetails) .addPaymentMethod(validPaymentMethodName) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -762,7 +762,7 @@ private List extractConstraintViolationMessages(ConstraintViolationExcep public void testFailedValidation_PaymentAPMRequest() { try { - SafechargeBaseRequest safechargeRequest = PaymentAPMRequest.builder() + NuveiBaseRequest nuveiRequest = PaymentAPMRequest.builder() .addMerchantInfo(invalidMerchantInfo) .addItem(dummyInvalidItem) .addUserDetails(dummyInvalidRestApiUserDetails) @@ -779,7 +779,7 @@ public void testFailedValidation_PaymentAPMRequest() { @Test public void testSuccessfulValidation_PaymentCCRequest() { - SafechargeBaseRequest safechargeRequest = PaymentCCRequest.builder() + NuveiBaseRequest nuveiRequest = PaymentCCRequest.builder() .addMerchantInfo(validMerchantInfo) .addCurrency(validCurrencyCode) .addAmount(validAmountTwoItems) @@ -794,14 +794,14 @@ public void testSuccessfulValidation_PaymentCCRequest() { .addTransactionType(Constants.TransactionType.Sale) .addCardData(dummyCardData) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test public void testFailedValidation_PaymentCCRequest() { try { - SafechargeBaseRequest safechargeRequest = PaymentCCRequest.builder() + NuveiBaseRequest nuveiRequest = PaymentCCRequest.builder() .addMerchantInfo(invalidMerchantInfo) .addItem(dummyInvalidItem) .addUserDetails(dummyInvalidRestApiUserDetails) @@ -821,14 +821,14 @@ public void testFailedValidation_PaymentCCRequest() { @Test public void testSuccessfulValidation_RefundTransactionRequest() { - SafechargeBaseRequest safechargeRequest = RefundTransactionRequest.builder() + NuveiBaseRequest nuveiRequest = RefundTransactionRequest.builder() .addMerchantInfo(validMerchantInfo) .addCurrency(validCurrencyCode) .addAmount(validAmount) .addRelatedTransactionId(dummyRelatedTransactionId) .addAuthCode(dummyAuthCode) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -848,14 +848,14 @@ public void testFailedValidation_RefundTransactionRequest() { @Test public void testSuccessfulValidation_SettleTransactionRequest() { - SafechargeBaseRequest safechargeRequest = SettleTransactionRequest.builder() + NuveiBaseRequest nuveiRequest = SettleTransactionRequest.builder() .addMerchantInfo(validMerchantInfo) .addAuthCode(dummyAuthCode) .addAmount(validAmount) .addCurrency(validCurrencyCode) .addRelatedTransactionId(dummyRelatedTransactionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -874,7 +874,7 @@ public void testFailedValidation_SettleTransactionRequest() { @Test public void testSuccessfulValidation_UpdateOrderRequest() { - SafechargeBaseRequest safechargeRequest = UpdateOrderRequest.builder() + NuveiBaseRequest nuveiRequest = UpdateOrderRequest.builder() .addMerchantInfo(validMerchantInfo) .addSessionToken(dummySessionToken) .addOrderId(dummyOrderId) @@ -882,14 +882,14 @@ public void testSuccessfulValidation_UpdateOrderRequest() { .addAmount(validAmount) .addItem(dummyValidItem) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test public void testFailedValidation_UpdateOrderRequest() { try { - SafechargeBaseRequest safechargeRequest = UpdateOrderRequest.builder() + NuveiBaseRequest nuveiRequest = UpdateOrderRequest.builder() .addMerchantInfo(invalidMerchantInfo) .addItem(dummyInvalidItem) .build(); @@ -903,14 +903,14 @@ public void testFailedValidation_UpdateOrderRequest() { @Test public void testSuccessfulValidation_VoidTransactionRequest() { - SafechargeBaseRequest safechargeRequest = VoidTransactionRequest.builder() + NuveiBaseRequest nuveiRequest = VoidTransactionRequest.builder() .addMerchantInfo(validMerchantInfo) .addAuthCode(dummyAuthCode) .addAmount(validAmount) .addCurrency(validCurrencyCode) .addRelatedTransactionId(dummyRelatedTransactionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -930,7 +930,7 @@ public void testFailedValidation_VoidTransactionRequest() { @Test public void testSuccessfulValidation_PayoutRequest() { - PayoutRequest safechargeRequest = PayoutRequest.builder() + PayoutRequest nuveiRequest = PayoutRequest.builder() .addMerchantInfo(validMerchantInfo) .addAmountAndCurrency(validAmount, validCurrencyCode) .addComment(dummyComment) @@ -942,7 +942,7 @@ public void testSuccessfulValidation_PayoutRequest() { .addClientUniqueId(dummyClientUniqueId) .addSubMethodDetails(dummySubmethod) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -961,7 +961,7 @@ public void testFailedValidation_PayoutRequest() { @Test public void testSuccessfulValidation_Verify3dRequest() { - SafechargeBaseRequest safechargeRequest = Verify3dRequest.builder() + NuveiBaseRequest nuveiRequest = Verify3dRequest.builder() .addSessionToken(dummySessionToken) .addMerchantInfo(validMerchantInfo) .addClientUniqueId(dummyClientUniqueId) @@ -973,13 +973,13 @@ public void testSuccessfulValidation_Verify3dRequest() { .addRelatedTransactionId(dummyRelatedTransactionId) .build(); - assertNotNull(safechargeRequest); + assertNotNull(nuveiRequest); } @Test public void testSuccessfulValidation_AddUPOCreditCardByTokenRequest() { - SafechargeBaseRequest safechargeRequest = AddUPOCreditCardByTokenRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOCreditCardByTokenRequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addCcToken(dummyCcToken) @@ -999,19 +999,19 @@ public void testSuccessfulValidation_AddUPOCreditCardByTokenRequest() { .addRegistrationDate("registrationDate") .addExpiryDate("expiryDate") .build(); - assertTrue(safechargeRequest != null); - assertTrue(safechargeRequest.toString().contains(dummyCcToken)); - assertTrue(safechargeRequest.toString().contains(dummyBrand)); - assertTrue(safechargeRequest.toString().contains(dummyUniqueCC)); - assertTrue(safechargeRequest.toString().contains(dummyLast4Digits)); - assertTrue(safechargeRequest.toString().contains(dummyCCNameOnCard)); + assertTrue(nuveiRequest != null); + assertTrue(nuveiRequest.toString().contains(dummyCcToken)); + assertTrue(nuveiRequest.toString().contains(dummyBrand)); + assertTrue(nuveiRequest.toString().contains(dummyUniqueCC)); + assertTrue(nuveiRequest.toString().contains(dummyLast4Digits)); + assertTrue(nuveiRequest.toString().contains(dummyCCNameOnCard)); } @Test public void testFailedValidation_AddUPOCreditCardByTokenRequest() { try { - SafechargeBaseRequest safechargeRequest = AddUPOCreditCardByTokenRequest.builder() + NuveiBaseRequest nuveiRequest = AddUPOCreditCardByTokenRequest.builder() .addMerchantInfo(invalidMerchantInfo) .build(); } catch (ConstraintViolationException e) { @@ -1022,7 +1022,7 @@ public void testFailedValidation_AddUPOCreditCardByTokenRequest() { @Test public void testSuccessfulValidation_GetUserUPOsRequest() { - SafechargeBaseRequest getUserUPOsRequest = GetUserUPOsRequest.builder() + NuveiBaseRequest getUserUPOsRequest = GetUserUPOsRequest.builder() .addUserTokenId(dummyUserId) .addMerchantInfo(validMerchantInfo) .build(); @@ -1033,7 +1033,7 @@ public void testSuccessfulValidation_GetUserUPOsRequest() { public void testFailedValidation_GetUserUPOsRequest() { try { - SafechargeBaseRequest getUserUPOsRequest = GetUserUPOsRequest.builder() + NuveiBaseRequest getUserUPOsRequest = GetUserUPOsRequest.builder() .addMerchantInfo(validMerchantInfo) .build(); fail(CONSTRAINT_VIOLATION_EXCEPTION_EXPECTED_BUT_OBJECT_CREATION_PASSED_SUCCESSFULLY); @@ -1045,7 +1045,7 @@ public void testFailedValidation_GetUserUPOsRequest() { @Test public void testSuccessfulValidation_EditUPOCreditCardRequest() { - SafechargeBaseRequest safechargeRequest = EditUPOCreditCardRequest.builder() + NuveiBaseRequest nuveiRequest = EditUPOCreditCardRequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addCcExpMonth(dummyCcExpMonth) @@ -1055,7 +1055,7 @@ public void testSuccessfulValidation_EditUPOCreditCardRequest() { .addBillingAddress(dummyFirstName, dummyLastName, dummyAddress, dummyPhone, dummyZip, dummyCity, dummyCountryCode, dummyState, dummyEMail, dummyLocale, dummyBirthDate, dummyCountry) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -1067,13 +1067,13 @@ public void testFailedValidation_EditUPOCreditCardRequest() { @Test public void testSuccessfulValidation_EditUPOAPMRequest() { - SafechargeBaseRequest safechargeRequest = EditUPOAPMRequest.builder() + NuveiBaseRequest nuveiRequest = EditUPOAPMRequest.builder() .addMerchantInfo(validMerchantInfo) .addApmData(dummyValidApmData) .addUserTokenId(dummyUserId) .addUserPaymentOptionId(dummyUserPaymentOptionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -1085,12 +1085,12 @@ public void testFailedValidation_EditUPOAPMRequest() { @Test public void testSuccessfulValidation_DeleteUPORequest() { - SafechargeBaseRequest safechargeRequest = DeleteUPORequest.builder() + NuveiBaseRequest nuveiRequest = DeleteUPORequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addUserPaymentOptionId(dummyUserPaymentOptionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -1102,12 +1102,12 @@ public void testFailedValidation_DeleteUPORequest() { @Test public void testSuccessfulValidation_SuspendUPORequest() { - SafechargeBaseRequest safechargeRequest = SuspendUPORequest.builder() + NuveiBaseRequest nuveiRequest = SuspendUPORequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addUserPaymentOptionId(dummyUserPaymentOptionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -1119,12 +1119,12 @@ public void testFailedValidation_SuspendUPORequest() { @Test public void testSuccessfulValidation_EnableUPORequest() { - SafechargeBaseRequest safechargeRequest = EnableUPORequest.builder() + NuveiBaseRequest nuveiRequest = EnableUPORequest.builder() .addMerchantInfo(validMerchantInfo) .addUserTokenId(dummyUserId) .addUserPaymentOptionId(dummyUserPaymentOptionId) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test diff --git a/src/test/java/com/safecharge/test/workflow/APMWorkflowTest.java b/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java similarity index 76% rename from src/test/java/com/safecharge/test/workflow/APMWorkflowTest.java rename to src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java index 35fd2ed..96b0ff9 100644 --- a/src/test/java/com/safecharge/test/workflow/APMWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow; +package com.nuvei.test.workflow; import java.io.IOException; import java.util.HashMap; @@ -14,24 +14,22 @@ import org.junit.Test; import org.junit.runners.MethodSorters; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetOrderDetailsRequest; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.OpenOrderRequest; -import com.safecharge.request.PaymentAPMRequest; -import com.safecharge.request.PaymentCCRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.UpdateOrderRequest; -import com.safecharge.response.OpenOrderResponse; -import com.safecharge.response.PaymentCCResponse; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.response.UpdateOrderResponse; -import com.safecharge.test.BaseTest; -import com.safecharge.util.Constants; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetOrderDetailsRequest; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.OpenOrderRequest; +import com.nuvei.request.PaymentAPMRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.UpdateOrderRequest; +import com.nuvei.response.OpenOrderResponse; +import com.nuvei.response.NuveiResponse; +import com.nuvei.response.UpdateOrderResponse; +import com.nuvei.test.BaseTest; +import com.nuvei.util.Constants; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/16/2017 */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @@ -52,10 +50,10 @@ public void init() { @Test public void test1_getSessionTokenTest() throws IOException { - SafechargeBaseRequest safechargeRequest = GetSessionTokenRequest.builder() + NuveiBaseRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - SafechargeResponse response = (SafechargeResponse)safechargeRequestExecutor.executeRequest(safechargeRequest); + NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -64,7 +62,7 @@ public void test1_getSessionTokenTest() throws IOException { @Test public void test2_openOrder() { - SafechargeBaseRequest openOrderRequest = OpenOrderRequest.builder() + NuveiBaseRequest openOrderRequest = OpenOrderRequest.builder() .addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("2") @@ -79,7 +77,7 @@ public void test2_openOrder() { "Sofia", "BG", null, "1000", "0884123456","county shipping") .addAmountDetails("1.5", "1.0", "1.0", "0.5") .build(); - OpenOrderResponse openOrderResponse = (OpenOrderResponse) safechargeRequestExecutor.executeRequest(openOrderRequest); + OpenOrderResponse openOrderResponse = (OpenOrderResponse) nuveiRequestExecutor.executeRequest(openOrderRequest); Assert.assertTrue(openOrderResponse != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(openOrderResponse.getStatus())); @@ -90,7 +88,7 @@ public void test2_openOrder() { @Test public void test3_updateOrder() { - SafechargeBaseRequest updateOrderRequest = UpdateOrderRequest.builder() + NuveiBaseRequest updateOrderRequest = UpdateOrderRequest.builder() .addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("2") @@ -107,7 +105,7 @@ public void test3_updateOrder() { .addOrderId(orderId) .build(); - UpdateOrderResponse updateOrderResponse = (UpdateOrderResponse) safechargeRequestExecutor.executeRequest(updateOrderRequest); + UpdateOrderResponse updateOrderResponse = (UpdateOrderResponse) nuveiRequestExecutor.executeRequest(updateOrderRequest); Assert.assertTrue(updateOrderResponse != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(updateOrderResponse.getStatus())); @@ -115,12 +113,12 @@ public void test3_updateOrder() { @Test public void test4_getOrderDetails() { - SafechargeBaseRequest safechargeRequest = GetOrderDetailsRequest.builder() + NuveiBaseRequest nuveiRequest = GetOrderDetailsRequest.builder() .addMerchantInfo(merchantInfo) .addOrderId(orderId) .addSessionToken(sessionToken) .build(); - SafechargeResponse response = (SafechargeResponse)safechargeRequestExecutor.executeRequest(safechargeRequest); + NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -129,9 +127,9 @@ public void test4_getOrderDetails() { @Test public void test5_paymentAPM() { Map userAccountDetails = new HashMap<>(); - userAccountDetails.put("email", "nikolad_safecharge_2@abv.bg"); + userAccountDetails.put("email", "nikolad_nuvei_2@abv.bg"); userAccountDetails.put("account_id", "XX362V4DC76VU"); - SafechargeBaseRequest request = PaymentAPMRequest.builder() + NuveiBaseRequest request = PaymentAPMRequest.builder() .addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("2") @@ -152,7 +150,7 @@ public void test5_paymentAPM() { .addPaymentMethod("apmgw_expresscheckout") .addUserAccountDetails(userAccountDetails) .build(); - SafechargeResponse response = safechargeRequestExecutor.executeRequest(request); + NuveiResponse response = nuveiRequestExecutor.executeRequest(request); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); diff --git a/src/test/java/com/safecharge/test/workflow/CompleteFunctionalTest.java b/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java similarity index 92% rename from src/test/java/com/safecharge/test/workflow/CompleteFunctionalTest.java rename to src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java index 113a49a..29a506c 100644 --- a/src/test/java/com/safecharge/test/workflow/CompleteFunctionalTest.java +++ b/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java @@ -1,29 +1,29 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow; +package com.nuvei.test.workflow; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/28/2017 */ -import com.safecharge.model.Item; -import com.safecharge.model.MerchantInfo; -import com.safecharge.model.SubMerchant; -import com.safecharge.request.*; -import com.safecharge.response.*; -import com.safecharge.test.BaseTest; -import com.safecharge.util.Constants; +import com.nuvei.model.Item; +import com.nuvei.model.MerchantInfo; +import com.nuvei.model.SubMerchant; +import com.nuvei.request.*; +import com.nuvei.response.*; +import com.nuvei.test.BaseTest; +import com.nuvei.util.Constants; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; import java.io.IOException; -import static com.safecharge.test.workflow.TestVariables.*; +import static com.nuvei.test.workflow.TestVariables.*; public class CompleteFunctionalTest extends BaseTest { @@ -363,33 +363,33 @@ public void testSuspendUpoRequest() { @Test public void testPaymentRequest() { String jsonPath = "mock/request/payment.json"; - SafechargeResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, PaymentRequest.class); + NuveiResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, PaymentRequest.class); Assert.assertNotNull(response); - Mockito.verify(safechargeRequestExecutor).executeRequest(Mockito.any(PaymentRequest.class)); + Mockito.verify(nuveiRequestExecutor).executeRequest(Mockito.any(PaymentRequest.class)); } @Test public void testInitPaymentRequest() { String jsonPath = "mock/request/initPayment.json"; - SafechargeResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, InitPaymentRequest.class); + NuveiResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, InitPaymentRequest.class); Assert.assertNotNull(response); - Mockito.verify(safechargeRequestExecutor).executeRequest(Mockito.any(InitPaymentRequest.class)); + Mockito.verify(nuveiRequestExecutor).executeRequest(Mockito.any(InitPaymentRequest.class)); } @Test public void testGetPaymentStatusRequest() { String jsonPath = "mock/request/getPaymentStatus.json"; - SafechargeResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, GetPaymentStatusRequest.class); + NuveiResponse response = baseMockTestMethodWithoutSessionToken(jsonPath, GetPaymentStatusRequest.class); Assert.assertNotNull(response); - Mockito.verify(safechargeRequestExecutor).executeRequest(Mockito.any(GetPaymentStatusRequest.class)); + Mockito.verify(nuveiRequestExecutor).executeRequest(Mockito.any(GetPaymentStatusRequest.class)); } @Test public void testVerify3dRequest() { - SafechargeBaseRequest request = Verify3dRequest.builder() + NuveiBaseRequest request = Verify3dRequest.builder() .addSessionToken("sessionToken") .addMerchantInfo(new MerchantInfo("key", "merchantId", "merchantSiteId", "host", Constants.HashAlgorithm.SHA256)) .addClientUniqueId("dummyClientUniqueId") @@ -401,9 +401,9 @@ public void testVerify3dRequest() { .addRelatedTransactionId("1234567") .build(); - SafechargeResponse response = baseMockTestMethodWithPrebuiltObjectWithoutSession(request); + NuveiResponse response = baseMockTestMethodWithPrebuiltObjectWithoutSession(request); Assert.assertNotNull(response); - Mockito.verify(safechargeRequestExecutor).executeRequest(Mockito.any(Verify3dRequest.class)); + Mockito.verify(nuveiRequestExecutor).executeRequest(Mockito.any(Verify3dRequest.class)); } } diff --git a/src/test/java/com/safecharge/test/workflow/CreditCardWorkflowTest.java b/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java similarity index 74% rename from src/test/java/com/safecharge/test/workflow/CreditCardWorkflowTest.java rename to src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java index 7800a1a..2e3b75b 100644 --- a/src/test/java/com/safecharge/test/workflow/CreditCardWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java @@ -1,10 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow; - -import static org.mockito.Mockito.when; +package com.nuvei.test.workflow; import java.io.IOException; import java.util.HashMap; @@ -15,31 +13,24 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.Mockito; - -import com.safecharge.biz.simple.payment.SimpleCreditCardPayment; -import com.safecharge.model.CardData; -import com.safecharge.model.ExternalMpi; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetOrderDetailsRequest; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.OpenOrderRequest; -import com.safecharge.request.PaymentCCRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.request.SafechargeRequest; -import com.safecharge.request.UpdateOrderRequest; -import com.safecharge.response.OpenOrderResponse; -import com.safecharge.response.PaymentCCResponse; -import com.safecharge.response.PaymentsResponse; -import com.safecharge.response.SafechargeResponse; -import com.safecharge.response.SuspendUPOResponse; -import com.safecharge.response.UpdateOrderResponse; -import com.safecharge.test.BaseTest; -import com.safecharge.util.Constants; + +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetOrderDetailsRequest; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.OpenOrderRequest; +import com.nuvei.request.PaymentCCRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.UpdateOrderRequest; +import com.nuvei.response.OpenOrderResponse; +import com.nuvei.response.PaymentCCResponse; +import com.nuvei.response.NuveiResponse; +import com.nuvei.response.UpdateOrderResponse; +import com.nuvei.test.BaseTest; +import com.nuvei.util.Constants; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/16/2017 */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @@ -61,10 +52,10 @@ public void init() { @Test public void test1_getSessionTokenTest() throws IOException { - SafechargeBaseRequest safechargeRequest = GetSessionTokenRequest.builder() + NuveiBaseRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - SafechargeResponse response = (SafechargeResponse)safechargeRequestExecutor.executeRequest(safechargeRequest); + NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -73,7 +64,7 @@ public void test1_getSessionTokenTest() throws IOException { @Test public void test2_openOrder() { - SafechargeBaseRequest openOrderRequest = new OpenOrderRequest.Builder().addMerchantInfo(merchantInfo) + NuveiBaseRequest openOrderRequest = new OpenOrderRequest.Builder().addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("2") .addSessionToken(sessionToken) @@ -87,7 +78,7 @@ public void test2_openOrder() { "Test street 1", "Sofia", "BG", null, "1000", "0884123456","county shipping") .addAmountDetails("1.5", "1.0", "1.0", "0.5") .build(); - OpenOrderResponse openOrderResponse = (OpenOrderResponse) safechargeRequestExecutor.executeRequest(openOrderRequest); + OpenOrderResponse openOrderResponse = (OpenOrderResponse) nuveiRequestExecutor.executeRequest(openOrderRequest); Assert.assertTrue(openOrderResponse != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(openOrderResponse.getStatus())); @@ -98,7 +89,7 @@ public void test2_openOrder() { @Test public void test3_updateOrder() { - SafechargeBaseRequest updateOrderRequest = UpdateOrderRequest.builder() + NuveiBaseRequest updateOrderRequest = UpdateOrderRequest.builder() .addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("2") @@ -115,7 +106,7 @@ public void test3_updateOrder() { .addOrderId(orderId) .build(); - UpdateOrderResponse updateOrderResponse = (UpdateOrderResponse) safechargeRequestExecutor.executeRequest(updateOrderRequest); + UpdateOrderResponse updateOrderResponse = (UpdateOrderResponse) nuveiRequestExecutor.executeRequest(updateOrderRequest); Assert.assertTrue(updateOrderResponse != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(updateOrderResponse.getStatus())); @@ -123,12 +114,12 @@ public void test3_updateOrder() { @Test public void test4_getOrderDetails() { - SafechargeBaseRequest safechargeRequest = GetOrderDetailsRequest.builder() + NuveiBaseRequest nuveiRequest = GetOrderDetailsRequest.builder() .addMerchantInfo(merchantInfo) .addOrderId(orderId) .addSessionToken(sessionToken) .build(); - SafechargeResponse response = (SafechargeResponse)safechargeRequestExecutor.executeRequest(safechargeRequest); + NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -137,9 +128,9 @@ public void test4_getOrderDetails() { @Test public void test5_paymentCC() { Map userAccountDetails = new HashMap<>(); - userAccountDetails.put("email", "nikolad_safecharge_2@abv.bg"); + userAccountDetails.put("email", "nikolad_nuvei_2@abv.bg"); userAccountDetails.put("account_id", "XX362V4DC76VU"); - SafechargeBaseRequest request = PaymentCCRequest.builder() + NuveiBaseRequest request = PaymentCCRequest.builder() .addMerchantInfo(merchantInfo) .addCurrency("EUR") .addAmount("4") @@ -160,7 +151,7 @@ public void test5_paymentCC() { "https://apmtest.gate2shop.com/nikolappp/defaultPending.do", "https://apmtest.gate2shop.com/nikolappp/defaultSuccess.do", null) .build(); - PaymentCCResponse response = (PaymentCCResponse) safechargeRequestExecutor.executeRequest(request); + PaymentCCResponse response = (PaymentCCResponse) nuveiRequestExecutor.executeRequest(request); Assert.assertTrue(response.getPartialApprovalDetails() == null); Assert.assertTrue(response.getFraudDetails() == null); Assert.assertEquals("3434",response.getCVV2Reply()); diff --git a/src/test/java/com/safecharge/test/workflow/TestVariables.java b/src/test/java/com/nuvei/test/workflow/TestVariables.java similarity index 96% rename from src/test/java/com/safecharge/test/workflow/TestVariables.java rename to src/test/java/com/nuvei/test/workflow/TestVariables.java index 08f969a..c284277 100644 --- a/src/test/java/com/safecharge/test/workflow/TestVariables.java +++ b/src/test/java/com/nuvei/test/workflow/TestVariables.java @@ -1,12 +1,12 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow; +package com.nuvei.test.workflow; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/29/2017 */ public class TestVariables { @@ -50,7 +50,7 @@ public class TestVariables { public static final String paymentMethod = "apmgw_Neteller"; public static final String nettelerAccount = "454651018446"; public static final String nettelerSecureId = "270955"; - public static final String account_id = "SkrillTestUser3@safecharge.com"; + public static final String account_id = "SkrillTestUser3@nuvei.com"; public static final String passwordSkrill = "RAc9AimVLF"; public static final String paymentMethodSkrill = "apmgw_MoneyBookers"; public static final String paymentMethodPayPall = "apmgw_expresscheckout"; diff --git a/src/test/java/com/safecharge/test/workflow/paymentCC/BasePaymentCCTest.java b/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java similarity index 63% rename from src/test/java/com/safecharge/test/workflow/paymentCC/BasePaymentCCTest.java rename to src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java index 28504a5..e458887 100644 --- a/src/test/java/com/safecharge/test/workflow/paymentCC/BasePaymentCCTest.java +++ b/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow.paymentCC; +package com.nuvei.test.workflow.paymentCC; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -17,23 +17,23 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.safecharge.biz.SafechargeRequestExecutor; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.GetSessionTokenRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.response.GetSessionTokenResponse; -import com.safecharge.util.Constants; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.GetSessionTokenRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.response.GetSessionTokenResponse; +import com.nuvei.util.Constants; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/29/2017 */ public class BasePaymentCCTest { protected static Validator validator; protected static Gson gson; - protected SafechargeRequestExecutor safechargeRequestExecutor; + protected NuveiRequestExecutor nuveiRequestExecutor; @BeforeClass public static void setup() { @@ -45,18 +45,18 @@ public static void setup() { @Before public void init() { - safechargeRequestExecutor = mock(SafechargeRequestExecutor.class); + nuveiRequestExecutor = mock(NuveiRequestExecutor.class); - when(safechargeRequestExecutor.executeRequest(Mockito.any(GetSessionTokenRequest.class))).thenReturn(gson.fromJson( + when(nuveiRequestExecutor.executeRequest(Mockito.any(GetSessionTokenRequest.class))).thenReturn(gson.fromJson( "{\"sessionToken\":\"997ecfc7-f3e3-44bb-9cbe-12a2bd724a31\",\"internalRequestId\":13150606,\"status\":\"SUCCESS\",\"errCode\":0,\"reason\":\"\",\"merchantId\":\"5137702336228767168\",\"merchantSiteId\":\"23\",\"version\":\"1.0\",\"clientRequestId\":\"111899\"}", GetSessionTokenResponse.class)); } public GetSessionTokenResponse executeGetSessionTokenRequest(MerchantInfo merchantInfo) { - SafechargeBaseRequest request = GetSessionTokenRequest.builder() + NuveiBaseRequest request = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - GetSessionTokenResponse response = (GetSessionTokenResponse) safechargeRequestExecutor.executeRequest(request); + GetSessionTokenResponse response = (GetSessionTokenResponse) nuveiRequestExecutor.executeRequest(request); Assert.assertTrue(0 == response.getErrCode()); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); diff --git a/src/test/java/com/safecharge/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java b/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java similarity index 80% rename from src/test/java/com/safecharge/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java rename to src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java index 92ec500..05862cf 100644 --- a/src/test/java/com/safecharge/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java +++ b/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java @@ -1,25 +1,25 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei International Group Limited. */ -package com.safecharge.test.workflow.paymentCC; +package com.nuvei.test.workflow.paymentCC; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import com.safecharge.model.MerchantDetails; -import com.safecharge.model.MerchantInfo; -import com.safecharge.request.PaymentCCRequest; -import com.safecharge.request.SafechargeBaseRequest; -import com.safecharge.response.GetSessionTokenResponse; -import com.safecharge.response.PaymentCCResponse; -import com.safecharge.test.workflow.TestVariables; -import com.safecharge.util.Constants; +import com.nuvei.model.MerchantDetails; +import com.nuvei.model.MerchantInfo; +import com.nuvei.request.PaymentCCRequest; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.response.GetSessionTokenResponse; +import com.nuvei.response.PaymentCCResponse; +import com.nuvei.test.workflow.TestVariables; +import com.nuvei.util.Constants; /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 3/29/2017 */ public class InvalidPaymentCCRequestTest extends BasePaymentCCTest { @@ -30,12 +30,12 @@ public class InvalidPaymentCCRequestTest extends BasePaymentCCTest { public void testExpiredSession() { GetSessionTokenResponse getSessionTokenResponse = executeGetSessionTokenRequest(validMerchantInfo); - Mockito.when(safechargeRequestExecutor.executeRequest(Mockito.any(PaymentCCRequest.class))) + Mockito.when(nuveiRequestExecutor.executeRequest(Mockito.any(PaymentCCRequest.class))) .thenReturn(gson.fromJson( "{\"userPaymentOptionId\":\"\",\"userTokenId\":\"Тest_0065\",\"sessionToken\":\"7d051160-4337-45f4-b11d-a31aa6df98c9\",\"clientUniqueId\":\"UniqueId\",\"internalRequestId\":13150706,\"status\":\"ERROR\",\"errCode\":1042,\"reason\":\"Invalid token\",\"merchantId\":\"5137702336228767168\",\"merchantSiteId\":\"23\",\"version\":\"1.0\",\"clientRequestId\":\"111899\"}", PaymentCCResponse.class)); - SafechargeBaseRequest request = PaymentCCRequest.builder() + NuveiBaseRequest request = PaymentCCRequest.builder() .addSessionToken(getSessionTokenResponse.getSessionToken()) .addMerchantInfo(validMerchantInfo) .addUserTokenId(TestVariables.userTokenId) @@ -59,7 +59,7 @@ public void testExpiredSession() { TestVariables.expirationMonth, TestVariables.expirationYear, null, TestVariables.CVV) .build(); - PaymentCCResponse response = (PaymentCCResponse) safechargeRequestExecutor.executeRequest(request); + PaymentCCResponse response = (PaymentCCResponse) nuveiRequestExecutor.executeRequest(request); Assert.assertTrue(Constants.ERR_CODE_INVALID_RBL_PAYMENT_TYPE == response.getErrCode()); Assert.assertTrue("Invalid token".equals(response.getReason())); diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml index 955e124..e7d6a9f 100644 --- a/src/test/resources/log4j2.xml +++ b/src/test/resources/log4j2.xml @@ -1,6 +1,6 @@ @@ -12,7 +12,7 @@ - + diff --git a/src/test/resources/mock/request/paymentAPM.json b/src/test/resources/mock/request/paymentAPM.json index 6f06119..5a6b656 100644 --- a/src/test/resources/mock/request/paymentAPM.json +++ b/src/test/resources/mock/request/paymentAPM.json @@ -3,7 +3,7 @@ "paymentMethod": "apmgw_expresscheckout", "userAccountDetails": { "account_id": "XX362V4DC76VU", - "email": "nikolad_safecharge_2@abv.bg" + "email": "nikolad_nuvei_2@abv.bg" }, "urlDetails": { "successUrl": "https://apmtest.gate2shop.com/nikolappp/defaultSuccess.do", diff --git a/src/test/resources/mock/response/paymentAPM.json b/src/test/resources/mock/response/paymentAPM.json index 3d09e1b..c923064 100644 --- a/src/test/resources/mock/response/paymentAPM.json +++ b/src/test/resources/mock/response/paymentAPM.json @@ -1,5 +1,5 @@ { - "redirectURL": "http://www.safecharge.com", + "redirectURL": "http://www.nuvei.com", "orderId": "9169303", "paymentMethodErrorCode": "0", "gwErrorCode": 0, From ef5ea778703d8926083c85fb75770fe054057092 Mon Sep 17 00:00:00 2001 From: Dilyan Angelov Date: Mon, 13 Jan 2025 14:08:09 +0000 Subject: [PATCH 44/55] Updated build-sdk.yaml --- build-sdk.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build-sdk.yaml b/build-sdk.yaml index c6bdfcd..d261af3 100644 --- a/build-sdk.yaml +++ b/build-sdk.yaml @@ -5,10 +5,13 @@ resources: name: DigitalPayments/DevOps-Templates type: git ref: master +schedules: +- cron: "20 00 * * *" + displayName: "Daily Security analysis" + branches: + include: + - develop + always: false - -stages: -- stage: build - displayName: "Build RestAPI1.0-SDK" - jobs: - - template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates +extends: + template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates \ No newline at end of file From 9c77b4e01ec53d8af17ca810bda440d0f2f1a164 Mon Sep 17 00:00:00 2001 From: Radostin Tonev Date: Tue, 15 Apr 2025 13:28:17 +0000 Subject: [PATCH 45/55] Merged PR 122850: Merge 1.7.13 to 2.0.0 Related work items: #1005132 --- LICENSE | 2 +- README.md | 26 +++--- pom-github.xml | 4 +- pom.xml | 4 +- src/main/java/com/nuvei/biz/Nuvei.java | 50 ++++++----- .../com/nuvei/biz/NuveiClientBuilder.java | 2 +- .../java/com/nuvei/biz/NuveiHttpClient.java | 4 +- .../com/nuvei/biz/NuveiRequestExecutor.java | 6 +- .../java/com/nuvei/biz/RequestBuilder.java | 85 ++++++++++--------- .../java/com/nuvei/biz/ServiceFactory.java | 2 +- .../biz/simple/payment/SimpleAPMPayment.java | 6 +- .../payment/SimpleCreditCardPayment.java | 8 +- .../NuveiConfigurationException.java | 2 +- .../com/nuvei/exception/NuveiException.java | 2 +- src/main/java/com/nuvei/model/Account.java | 2 +- src/main/java/com/nuvei/model/Acquirer.java | 2 +- src/main/java/com/nuvei/model/Addendums.java | 2 +- .../com/nuvei/model/AddendumsAirlines.java | 2 +- .../AddendumsAirlinesFlightLegDetails.java | 2 +- .../AddendumsAirlinesPassengerDetails.java | 2 +- .../AddendumsAirlinesReservationDetails.java | 2 +- .../AddendumsCardPresentPointOfSale.java | 2 +- .../nuvei/model/AddendumsLocalPayment.java | 2 +- .../java/com/nuvei/model/AmountDetails.java | 2 +- src/main/java/com/nuvei/model/AmountInfo.java | 2 +- .../com/nuvei/model/ApiExternalToken.java | 2 +- .../com/nuvei/model/AssuranceDetails.java | 2 +- .../com/nuvei/model/BasePaymentOption.java | 2 +- .../java/com/nuvei/model/BillingAddress.java | 2 +- .../java/com/nuvei/model/BrowserDetails.java | 2 +- src/main/java/com/nuvei/model/Card.java | 2 +- src/main/java/com/nuvei/model/CardData.java | 2 +- .../java/com/nuvei/model/CardResponse.java | 2 +- .../model/CashierPaymentMethodDetails.java | 2 +- .../nuvei/model/CommonUserDetailsInfo.java | 2 +- .../com/nuvei/model/CurrencyConversion.java | 2 +- .../java/com/nuvei/model/DeviceDetails.java | 3 +- .../com/nuvei/model/DynamicDescriptor.java | 2 +- .../java/com/nuvei/model/ExternalMpi.java | 2 +- .../nuvei/model/ExternalSchemeDetails.java | 2 +- .../java/com/nuvei/model/ExternalToken.java | 2 +- .../com/nuvei/model/ExternalTokenInfo.java | 2 +- .../nuvei/model/ExternalTokenProvider.java | 2 +- src/main/java/com/nuvei/model/Field.java | 2 +- .../java/com/nuvei/model/FraudDetails.java | 2 +- .../com/nuvei/model/FraudDetailsSystem.java | 2 +- src/main/java/com/nuvei/model/FraudRule.java | 2 +- .../java/com/nuvei/model/InitPaymentCard.java | 2 +- .../nuvei/model/InitPaymentPaymentOption.java | 2 +- .../com/nuvei/model/InitPaymentThreeD.java | 2 +- src/main/java/com/nuvei/model/Item.java | 2 +- .../com/nuvei/model/LocalizationMessage.java | 2 +- .../com/nuvei/model/MerchantBaseInfo.java | 4 +- .../java/com/nuvei/model/MerchantDetails.java | 2 +- .../java/com/nuvei/model/MerchantInfo.java | 2 +- src/main/java/com/nuvei/model/OpenAmount.java | 2 +- .../java/com/nuvei/model/OpenOrderCard.java | 2 +- .../nuvei/model/OpenOrderPaymentOption.java | 2 +- .../java/com/nuvei/model/OpenOrderThreeD.java | 2 +- .../OpenOrderThreeDV2AdditionalParams.java | 2 +- .../nuvei/model/PartialApprovalDetails.java | 2 +- ...aymentDetailsAlternativePaymentMethod.java | 2 +- .../com/nuvei/model/PaymentDetailsCard.java | 2 +- .../model/PaymentDetailsPaymentOption.java | 2 +- .../com/nuvei/model/PaymentDetailsThreeD.java | 2 +- .../java/com/nuvei/model/PaymentInfo.java | 2 +- .../java/com/nuvei/model/PaymentMethod.java | 2 +- .../com/nuvei/model/PaymentMethodDetails.java | 2 +- .../java/com/nuvei/model/PaymentOption.java | 2 +- .../nuvei/model/PaymentOptionResponse.java | 2 +- src/main/java/com/nuvei/model/Proxy.java | 2 +- src/main/java/com/nuvei/model/Rate.java | 2 +- .../java/com/nuvei/model/RateByCurrency.java | 2 +- .../com/nuvei/model/RecipientDetails.java | 2 +- .../com/nuvei/model/RefundPaymentOption.java | 3 +- .../com/nuvei/model/RestApiUserDetails.java | 2 +- src/main/java/com/nuvei/model/Sdk.java | 2 +- .../java/com/nuvei/model/SdkResponse.java | 2 +- .../com/nuvei/model/StoredCredentials.java | 2 +- .../java/com/nuvei/model/SubMerchant.java | 2 +- src/main/java/com/nuvei/model/SubMethod.java | 2 +- .../com/nuvei/model/SubMethodDetails.java | 2 +- .../com/nuvei/model/SubscriptionPlan.java | 2 +- .../nuvei/model/SubscriptionsListElement.java | 2 +- src/main/java/com/nuvei/model/ThreeD.java | 2 +- .../com/nuvei/model/TokenizationData.java | 2 +- src/main/java/com/nuvei/model/UrlDetails.java | 2 +- .../java/com/nuvei/model/UserAddress.java | 2 +- .../java/com/nuvei/model/UserDetails.java | 2 +- .../com/nuvei/model/UserDetailsCashier.java | 2 +- .../com/nuvei/model/UserPaymentOption.java | 2 +- .../com/nuvei/model/V2AdditionalParams.java | 2 +- .../java/com/nuvei/model/Verify3dCard.java | 2 +- .../nuvei/model/Verify3dPaymentOption.java | 2 +- .../java/com/nuvei/model/Verify3dThreeD.java | 2 +- .../nuvei/request/AccountCaptureRequest.java | 2 +- .../com/nuvei/request/AddUPOAPMRequest.java | 2 +- .../AddUPOCreditCardByTempTokenRequest.java | 2 +- .../AddUPOCreditCardByTokenRequest.java | 2 +- .../request/AddUPOCreditCardRequest.java | 2 +- .../nuvei/request/Authorization3DRequest.java | 2 +- .../request/Authorize3dAndPaymentRequest.java | 2 +- .../com/nuvei/request/Authorize3dRequest.java | 8 +- .../request/CancelSubscriptionRequest.java | 6 +- .../com/nuvei/request/CardDetailsRequest.java | 2 +- .../request/CardTokenizationRequest.java | 3 +- .../request/CreateSubscriptionRequest.java | 2 +- .../com/nuvei/request/CreateUserRequest.java | 2 +- .../com/nuvei/request/DccDetailsRequest.java | 2 +- .../com/nuvei/request/DeleteUPORequest.java | 2 +- .../com/nuvei/request/Dynamic3DRequest.java | 2 +- .../com/nuvei/request/EditUPOAPMRequest.java | 2 +- .../request/EditUPOCreditCardRequest.java | 2 +- .../com/nuvei/request/EnableUPORequest.java | 2 +- .../GetMerchantPaymentMethodsRequest.java | 2 +- .../nuvei/request/GetOrderDetailsRequest.java | 2 +- .../request/GetPaymentStatusRequest.java | 2 +- .../nuvei/request/GetPayoutStatusRequest.java | 2 +- .../nuvei/request/GetSessionTokenRequest.java | 2 +- .../request/GetSubscriptionPlansRequest.java | 6 +- .../request/GetSubscriptionsListRequest.java | 2 +- .../nuvei/request/GetUserDetailsRequest.java | 2 +- .../com/nuvei/request/GetUserUPOsRequest.java | 2 +- .../com/nuvei/request/InitPaymentRequest.java | 23 ++++- .../com/nuvei/request/McpRatesRequest.java | 2 +- .../com/nuvei/request/NuveiBaseRequest.java | 6 +- .../com/nuvei/request/NuveiCCRequest.java | 2 +- .../request/NuveiOrderDetailsRequest.java | 61 ++++++------- .../com/nuvei/request/NuveiOrderRequest.java | 2 +- .../nuvei/request/NuveiPaymentRequest.java | 2 +- .../java/com/nuvei/request/NuveiRequest.java | 4 +- .../request/NuveiTransactionRequest.java | 2 +- .../com/nuvei/request/OpenOrderRequest.java | 2 +- .../request/OrderRequestWithDetails.java | 18 ++-- .../com/nuvei/request/Payment3DRequest.java | 2 +- .../com/nuvei/request/PaymentAPMRequest.java | 8 +- .../com/nuvei/request/PaymentCCRequest.java | 2 +- .../com/nuvei/request/PaymentRequest.java | 2 +- .../java/com/nuvei/request/PayoutRequest.java | 30 +++++-- .../request/RefundTransactionRequest.java | 6 +- .../request/SettleTransactionRequest.java | 2 +- .../com/nuvei/request/SuspendUPORequest.java | 2 +- .../com/nuvei/request/UpdateOrderRequest.java | 2 +- .../com/nuvei/request/UpdateUserRequest.java | 2 +- .../com/nuvei/request/Verify3dRequest.java | 19 ++++- .../nuvei/request/VoidTransactionRequest.java | 2 +- .../request/basic/CashierUserRequest.java | 2 +- .../request/basic/EditUPOBasicRequest.java | 9 +- .../request/builder/NuveiBaseBuilder.java | 8 +- .../builder/NuveiBaseOrderBuilder.java | 4 +- .../nuvei/request/builder/NuveiBuilder.java | 6 +- .../nuvei/request/builder/NuveiCCBuilder.java | 2 +- .../builder/NuveiCashierUserBuilder.java | 2 +- .../request/builder/NuveiOrderBuilder.java | 16 +++- .../builder/NuveiOrderWithDetailsBuilder.java | 2 +- .../request/builder/NuveiPaymentBuilder.java | 2 +- .../builder/NuveiTransactionBuilder.java | 2 +- .../nuvei/request/builder/PaymentBuilder.java | 2 +- .../response/AccountCaptureResponse.java | 2 +- .../com/nuvei/response/AddUPOAPMResponse.java | 2 +- .../AddUPOCreditCardByTempTokenResponse.java | 2 +- .../AddUPOCreditCardByTokenResponse.java | 2 +- .../response/AddUPOCreditCardResponse.java | 2 +- .../response/Authorization3DResponse.java | 2 +- .../Authorize3dAndPaymentResponse.java | 2 +- .../nuvei/response/Authorize3dResponse.java | 2 +- .../response/CancelSubscriptionResponse.java | 2 +- .../nuvei/response/CardDetailsResponse.java | 2 +- .../response/CardTokenizationResponse.java | 2 +- .../response/CreateSubscriptionResponse.java | 2 +- .../nuvei/response/DccDetailsResponse.java | 2 +- .../com/nuvei/response/DeleteUPOResponse.java | 2 +- .../com/nuvei/response/Dynamic3DResponse.java | 2 +- .../nuvei/response/EditUPOAPMResponse.java | 2 +- .../response/EditUPOCreditCardResponse.java | 2 +- .../com/nuvei/response/EnableUPOResponse.java | 2 +- .../GetMerchantPaymentMethodsResponse.java | 2 +- .../response/GetOrderDetailsResponse.java | 2 +- .../response/GetPaymentStatusResponse.java | 12 ++- .../response/GetPayoutStatusResponse.java | 2 +- .../response/GetSessionTokenResponse.java | 2 +- .../GetSubscriptionPlansResponse.java | 2 +- .../GetSubscriptionsListResponse.java | 2 +- .../response/GetUserDetailsResponse.java | 2 +- .../nuvei/response/GetUserUPOsResponse.java | 2 +- .../nuvei/response/InitPaymentResponse.java | 2 +- .../com/nuvei/response/McpRatesResponse.java | 2 +- .../nuvei/response/NuveiOrderResponse.java | 2 +- .../com/nuvei/response/NuveiResponse.java | 2 +- .../response/NuveiTransactionResponse.java | 2 +- .../com/nuvei/response/OpenOrderResponse.java | 2 +- .../com/nuvei/response/Payment3DResponse.java | 2 +- .../nuvei/response/PaymentAPMResponse.java | 2 +- .../com/nuvei/response/PaymentCCResponse.java | 2 +- .../com/nuvei/response/PaymentResponse.java | 2 +- .../nuvei/response/PaymentsCCResponse.java | 2 +- .../com/nuvei/response/PaymentsResponse.java | 2 +- .../com/nuvei/response/PayoutResponse.java | 2 +- .../response/RefundTransactionResponse.java | 2 +- .../response/SettleTransactionResponse.java | 2 +- .../nuvei/response/SuspendUPOResponse.java | 2 +- .../com/nuvei/response/ThreeDResponse.java | 2 +- .../nuvei/response/UpdateOrderResponse.java | 2 +- .../java/com/nuvei/response/UserResponse.java | 2 +- .../com/nuvei/response/Verify3dResponse.java | 2 +- .../response/VoidTransactionResponse.java | 2 +- .../java/com/nuvei/util/APIConstants.java | 3 +- .../java/com/nuvei/util/AddressUtils.java | 2 +- src/main/java/com/nuvei/util/CardUtils.java | 2 +- .../java/com/nuvei/util/ChecksumUtils.java | 4 +- src/main/java/com/nuvei/util/Constants.java | 2 +- src/main/java/com/nuvei/util/DeviceUtils.java | 2 +- .../nuvei/util/DynamicDescriptorUtils.java | 2 +- .../java/com/nuvei/util/MerchantUtils.java | 2 +- .../java/com/nuvei/util/RequestUtils.java | 4 +- src/main/java/com/nuvei/util/UrlUtils.java | 2 +- .../java/com/nuvei/util/ValidChecksum.java | 2 +- .../java/com/nuvei/util/ValidationUtils.java | 4 +- src/test/java/com/nuvei/biz/NuveiTest.java | 45 ++++++---- src/test/java/com/nuvei/test/BaseTest.java | 2 +- .../java/com/nuvei/test/ValidationsTest.java | 36 +------- .../nuvei/test/workflow/APMWorkflowTest.java | 14 ++- .../test/workflow/CompleteFunctionalTest.java | 2 +- .../test/workflow/CreditCardWorkflowTest.java | 14 ++- .../nuvei/test/workflow/TestVariables.java | 2 +- .../workflow/paymentCC/BasePaymentCCTest.java | 6 +- .../InvalidPaymentCCRequestTest.java | 2 +- src/test/resources/log4j2.xml | 2 +- 228 files changed, 507 insertions(+), 455 deletions(-) diff --git a/LICENSE b/LICENSE index a8bf1d6..e9ecc5e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Nuvei Bulgaria ltd +Copyright (c) 2024 Nuvei Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 39893db..1166a30 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,37 @@ # Nuvei REST API SDK for Java. [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.nuvei/nuvei-sdk-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.nuvei/nuvei-sdk-java) -[![codecov](https://codecov.io/gh/NuveiInternational/nuvei-java/branch/development/graph/badge.svg)](https://codecov.io/gh/NuveiInternational/nuvei-java) +[![codecov](https://codecov.io/gh/Nuvei/nuvei-java/branch/development/graph/badge.svg)](https://codecov.io/gh/Nuvei/nuvei-java) -Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. For Nuvei REST API documentation, please see: https://docs.nuvei.com/api/main +Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. For Nuvei REST API documentation, please see: https://docs.nuvei.com/documentation/accept-payment/server-to-server/server-sdks/java-sdk/ ## Requirements -Java 1.7 or later. +Java 1.8 or later. ### Maven If your application is going to be deployed on a Java EE server add the following dependency: ```xml - - com.nuvei + + + com.nuvei.com nuvei-sdk-java 2.0.0 ``` -If you are going to use the SDK in Java SE or a non Java EE server please add a Bean Validation API Implementation dependency. Certified implementations of Bean Validation API can be found here: http://beanvalidation.org/certified/ (v.1.1 implementation required). +If you are going to use the SDK in Java SE or a non Java EE server please add a Bean Validation API Implementation dependency. Certified implementations of Bean Validation API can be found here: http://beanvalidation.org/certified/ (v.1.1 implementation required). For example: ```xml + ... - - com.nuvei + + com.nuvei.com nuvei-sdk-java 2.0.0 @@ -43,7 +45,7 @@ For example: ## Running your first request -You only need to setup a HTTP Client and to provide the Nuvei API host to the request executor and then you can start building requests and send them to the Nuvei API. +You only need to setup a HTTP Client and to provide the Nuvei API host to the request executor and then you can start building requests and send them to the Nuvei API. Check how simple it is trough this sample: @@ -65,12 +67,12 @@ public class Sample { "MERCHANT_SITE_ID_PROVIDED_BY_NUVEI", APIConstants.INTEGRATION_HOST, Constants.HashAlgorithm.SHA256); NuveiRequest nuveiRequest = GetSessionTokenRequest.builder() - .addMerchantInfo(merchantInfo) - .build(); + .addMerchantInfo(merchantInfo) + .build(); NuveiResponse response = requestExecutor.executeRequest(nuveiRequest); System.out.println("Received sessionToken = " + response.getSessionToken()); } } ``` -More samples tests can be found [here](https://github.com/Nuvei/nuvei-server-java/tree/master/src/test/java/com/nuvei/test/workflow/). +More samples tests can be found [here](https://github.com/Nuvei/nuvei-server-java/tree/master/src/test/java/com/nuvei/test/workflow). diff --git a/pom-github.xml b/pom-github.xml index b6a722e..0b9fc8a 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -10,11 +10,11 @@ Nuvei SDK for Java Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s + easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei's payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. - https://github.com/Nuvei/nuvei-server-java + https://github.com/Nuvei/nuvei-java Nuvei diff --git a/pom.xml b/pom.xml index b0f5a61..c7f0345 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ Nuvei SDK for Java - Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei’s + Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei's REST API is a simple, + easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei's payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. diff --git a/src/main/java/com/nuvei/biz/Nuvei.java b/src/main/java/com/nuvei/biz/Nuvei.java index 4fb738e..3f4fef9 100644 --- a/src/main/java/com/nuvei/biz/Nuvei.java +++ b/src/main/java/com/nuvei/biz/Nuvei.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; @@ -121,6 +121,7 @@ private String getSessionToken() throws NuveiException { * @param shippingTrackingDetails Holds information about shippingTrackingDetails. * @param cvvNotUsed Flag if CVV is not used * @param serviceDueDate Subscription end date + * @param digitalAssetType Digital currency transaction identifier. * @return Passes through the response from Nuvei's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand NuveiConfigurationException exception will be thrown. @@ -133,8 +134,8 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, - String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, - ShippingTrackingDetails shippingTrackingDetails, String cvvNotUsed, String serviceDueDate) throws NuveiException { + String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String cvvNotUsed, String serviceDueDate, String digitalAssetType) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -142,7 +143,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate, digitalAssetType); return (PaymentResponse) requestExecutor.execute(request); } @@ -182,13 +183,13 @@ private void ensureMerchantInfoAndSessionTokenNotNull() { public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId, String clientRequestId, String currency, String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, String customData, UserAddress billingAddress, String userId, String aftOverride, - RecipientDetails recipientDetails) throws NuveiException { + RecipientDetails recipientDetails, String relatedTransactionId) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); NuveiBaseRequest request = requestBuilder.getInitPaymentRequest(sessionToken, userTokenId, clientUniqueId, clientRequestId, currency, amount, deviceDetails, paymentOption, urlDetails, customData, billingAddress, merchantInfo, userId, aftOverride, - recipientDetails); + recipientDetails, relatedTransactionId); return (InitPaymentResponse) requestExecutor.execute(request); } @@ -240,9 +241,10 @@ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId * @param currencyConversion Used to specify currency conversion details * @param openAmount Defines minimum and maximum allowed amount for the order * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". - * @return Passes through the response from Nuvei's REST API. + * @param digitalAssetType Digital currency transaction identifier. + * @return Passes through the response from Safecharge's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. * @throws NuveiException if there are request related problems. */ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, String clientUniqueId, String customSiteName, String productId, @@ -253,7 +255,8 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S Addendums addendums, String customData, Boolean autoPayment3D, String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) throws NuveiException { + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String digitalAssetType) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -261,7 +264,8 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S paymentOption, transactionType, currency, amount, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, urlDetails, userTokenId, clientUniqueId, userPaymentOption, paymentMethod, amountDetails, addendums, customData, autoPayment3D, isMoto, authenticationOnlyType, subMerchant, isRebilling, rebillingType, - preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride, companyDetails, shippingTrackingDetails); + preventOverride, userId, isPartialApproval, externalSchemeDetails, currencyConversion, openAmount, aftOverride, companyDetails, + shippingTrackingDetails, digitalAssetType); return (OpenOrderResponse) requestExecutor.execute(request); } @@ -440,20 +444,22 @@ public RefundTransactionResponse refundTransaction(String clientUniqueId, String * Required if you wish to use the paymentOptionId field for future charging of this user without re-collecting the payment details * @param paymentOption This class represents the details about the payment method. * Can have either card, alternativePaymentMethod, or userPaymentOptionId. - * @return Passes through the response from Nuvei's REST API. + * @param digitalAssetType Digital currency transaction identifier. + * @return Passes through the response from Safecharge's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. * @throws NuveiException if there are request related problems. */ public Verify3dResponse verify3d(String clientUniqueId, String clientRequestId, String amount, String currency, UserAddress billingAddress, String customData, String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, - SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) throws NuveiException { + SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption, + String digitalAssetType) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); NuveiBaseRequest request = requestBuilder.getVerify3dRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, amount, currency, billingAddress, customData, customSiteName, merchantDetails, relatedTransactionId, subMerchant, userId, - userTokenId, paymentOption); + userTokenId, paymentOption, digitalAssetType); return (Verify3dResponse) requestExecutor.execute(request); } @@ -505,9 +511,10 @@ public Verify3dResponse verify3d(String clientUniqueId, String clientRequestId, * due to a consumer’s lack of funds within the desired payment method. * @param externalSchemeDetails Used to provide original transactionId for the initial payment as originated in external system and card brand. * @param currencyConversion Used to specify currency conversion details - * @return Passes through the response from Nuvei's REST API. + * @param digitalAssetType Digital currency transaction identifier. + * @return Passes through the response from Safecharge's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} - * method is not invoked beforehand NuveiConfigurationException exception will be thrown. + * method is not invoked beforehand SafechargeConfigurationException exception will be thrown. * @throws NuveiException if there are request related problems. */ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId, String clientRequestId, PaymentOption paymentOption, @@ -518,7 +525,7 @@ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId String customSiteName, String productId, String customData, String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - String isPartialApproval) throws NuveiException { + String isPartialApproval, String digitalAssetType) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -526,7 +533,7 @@ public Authorize3dResponse authorize3d(String userTokenId, String clientUniqueId clientRequestId, paymentOption, isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, subMerchant, userId, externalSchemeDetails, - currencyConversion, isPartialApproval); + currencyConversion, isPartialApproval, digitalAssetType); return (Authorize3dResponse) requestExecutor.execute(request); } @@ -659,7 +666,8 @@ public AccountCaptureResponse accountCapture(String clientRequestId, String user * @param subMethodDetails Details about submethod * @param cardData An alternative to sending the userPaymentOptionId for card payouts. * @param deviceDetails Information about client device - * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. + * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. + * @param digitalAssetType Digital currency transaction identifier. * @return Passes through the response from Nuvei's REST API. * @throws NuveiException */ @@ -667,7 +675,7 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, - CurrencyConversion currencyConversion) + CurrencyConversion currencyConversion, String digitalAssetType) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); @@ -676,7 +684,7 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c PayoutRequest request = requestBuilder.getPayoutRequest(sessionToken, merchantInfo, userTokenId, clientUniqueId, clientRequestId, amount, currency,userPaymentOption, comment, dynamicDescriptor, merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails, companyDetails, - currencyConversion); + currencyConversion, digitalAssetType); return (PayoutResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/nuvei/biz/NuveiClientBuilder.java b/src/main/java/com/nuvei/biz/NuveiClientBuilder.java index e9608fa..5784f2a 100644 --- a/src/main/java/com/nuvei/biz/NuveiClientBuilder.java +++ b/src/main/java/com/nuvei/biz/NuveiClientBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; diff --git a/src/main/java/com/nuvei/biz/NuveiHttpClient.java b/src/main/java/com/nuvei/biz/NuveiHttpClient.java index cca4b36..4ef0a8b 100644 --- a/src/main/java/com/nuvei/biz/NuveiHttpClient.java +++ b/src/main/java/com/nuvei/biz/NuveiHttpClient.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; @@ -31,7 +31,7 @@ public static HttpClient createDefault() { } /** - * Creates a pre-configured {@link HttpClient} instance which connects to Nuvei's API via {@link Proxy}. + * Creates a pre-configured {@link HttpClient} instance which connects 2007 - 2024 Nuvei Corporation's API via {@link Proxy}. * * @param proxy A {@link Proxy} object to get the connection info from * @return {@link HttpClient} with specific Nuvei's default properties and the proxy properties defined by the {@code proxy} diff --git a/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java b/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java index c2af2ec..155d11f 100644 --- a/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java +++ b/src/main/java/com/nuvei/biz/NuveiRequestExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; @@ -182,7 +182,7 @@ public void init(HttpClient httpClient) { } /** - * Sends a {@link NuveiRequest} to Nuvei's API via HTTP POST method. + * Sends a {@link NuveiRequest} 2007 - 2024 Nuvei Corporation's API via HTTP POST method. * * @param request {@link NuveiRequest} API request object * @return {@link NuveiResponse} API response object or null if the response can't be parsed @@ -196,7 +196,7 @@ public NuveiResponse executeRequest(NuveiBaseRequest request) { } /** - * Sends a {@link NuveiRequest} to Nuvei's API via HTTP POST method. + * Sends a {@link NuveiRequest} 2007 - 2024 Nuvei Corporation's API via HTTP POST method. * * @param request {@link NuveiRequest} API request object * @return {@link NuveiResponse} API response object. diff --git a/src/main/java/com/nuvei/biz/RequestBuilder.java b/src/main/java/com/nuvei/biz/RequestBuilder.java index d653a65..10ea247 100644 --- a/src/main/java/com/nuvei/biz/RequestBuilder.java +++ b/src/main/java/com/nuvei/biz/RequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; @@ -20,17 +20,17 @@ public NuveiBaseRequest getSessionTokenRequest(MerchantInfo merchantInfo) { } public NuveiBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, - String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, - String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, - RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, - DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, - UrlDetails urlDetails, String customSiteName, String productId, String customData, - String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, - String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, - String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, - RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed, String serviceDueDate) { + String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, + String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, + RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, + DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, + UrlDetails urlDetails, String customSiteName, String productId, String customData, + String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, + String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, + String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, + String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, + RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, + String cvvNotUsed, String serviceDueDate, String digitalAssetType) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -73,13 +73,14 @@ public NuveiBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sess .addShippingTrackingDetails(shippingTrackingDetails) .addCvvNotUsed(cvvNotUsed) .addServiceDueDate(serviceDueDate) + .addDigitalAssetType(digitalAssetType) .build(); } public NuveiBaseRequest getInitPaymentRequest(String sessionToken, String userTokenId, String clientUniqueId, String clientRequestId, String currency, - String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, - String customData, UserAddress billingAddress, MerchantInfo merchantInfo, String userId, String aftOverride, - RecipientDetails recipientDetails) { + String amount, DeviceDetails deviceDetails, InitPaymentPaymentOption paymentOption, UrlDetails urlDetails, + String customData, UserAddress billingAddress, MerchantInfo merchantInfo, String userId, String aftOverride, + RecipientDetails recipientDetails, String relatedTransactionId) { return InitPaymentRequest.builder() .addSessionToken(sessionToken) .addUserTokenId(userTokenId) @@ -96,18 +97,19 @@ public NuveiBaseRequest getInitPaymentRequest(String sessionToken, String userTo .addUserId(userId) .addAftOverride(aftOverride) .addRecipientDetails(recipientDetails) + .addRelatedTransactionId(relatedTransactionId) .build(); } public NuveiBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, String sessionToken, String clientRequestId, String customSiteName, - String productId, OpenOrderPaymentOption paymentOption, Constants.TransactionType transactionType, - String currency, String amount, List items, DeviceDetails deviceDetails, RestApiUserDetails userDetails, - UserAddress shippingAddress, UserAddress billingAddress, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, - UrlDetails urlDetails, String userTokenId, String clientUniqueId, UserPaymentOption userPaymentOption, - String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, - String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, - String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, - OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails) { + String productId, OpenOrderPaymentOption paymentOption, Constants.TransactionType transactionType, + String currency, String amount, List items, DeviceDetails deviceDetails, RestApiUserDetails userDetails, + UserAddress shippingAddress, UserAddress billingAddress, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, + UrlDetails urlDetails, String userTokenId, String clientUniqueId, UserPaymentOption userPaymentOption, + String paymentMethod, AmountDetails amountDetails, Addendums addendums, String customData, Boolean autoPayment3D, + String isMoto, String authenticationOnlyType, SubMerchant subMerchant, Integer isRebilling, String rebillingType, + String preventOverride, String userId, String isPartialApproval, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, + OpenAmount openAmount, String aftOverride, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, String digitalAssetType) { return OpenOrderRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -148,6 +150,7 @@ public NuveiBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, String se .addAftOverride(aftOverride) .addCompanyDetails(companyDetails) .addShippingTrackingDetails(shippingTrackingDetails) + .addDigitalAssetType(digitalAssetType) .build(); } @@ -217,10 +220,10 @@ public NuveiBaseRequest getSettleTransactionRequest(String sessionToken, Merchan } public NuveiBaseRequest getRefundTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, - String clientRequestId, UrlDetails urlDetails, String amount, String authCode, - String comment, String currency, String customData, String customSiteName, - String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { + String clientRequestId, UrlDetails urlDetails, String amount, String authCode, + String comment, String currency, String customData, String customSiteName, + String productId, String relatedTransactionId, SubMerchant subMerchant, + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -243,9 +246,10 @@ public NuveiBaseRequest getRefundTransactionRequest(String sessionToken, Merchan } public NuveiBaseRequest getVerify3dRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, String clientRequestId, - String amount, String currency, UserAddress billingAddress, String customData, - String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, - SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption) { + String amount, String currency, UserAddress billingAddress, String customData, + String customSiteName, MerchantDetails merchantDetails, String relatedTransactionId, + SubMerchant subMerchant, String userId, String userTokenId, Verify3dPaymentOption paymentOption, + String digitalAssetType) { return Verify3dRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -262,18 +266,19 @@ public NuveiBaseRequest getVerify3dRequest(String sessionToken, MerchantInfo mer .addUserId(userId) .addUserTokenId(userTokenId) .addPaymentOption(paymentOption) + .addDigitalAssetType(digitalAssetType) .build(); } public NuveiBaseRequest getAuthorize3dRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, - String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, - String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, - RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, - DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, - UrlDetails urlDetails, String customSiteName, String productId, String customData, - String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, - SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, - CurrencyConversion currencyConversion, String isPartialApproval) { + String clientRequestId, PaymentOption paymentOption, Integer isRebilling, String currency, + String amount, AmountDetails amountDetails, List items, DeviceDetails deviceDetails, + RestApiUserDetails userDetails, UserAddress shippingAddress, UserAddress billingAddress, + DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, Addendums addendums, + UrlDetails urlDetails, String customSiteName, String productId, String customData, + String relatedTransactionId, Constants.TransactionType transactionType, Boolean autoPayment3D, + SubMerchant subMerchant, String userId, ExternalSchemeDetails externalSchemeDetails, + CurrencyConversion currencyConversion, String isPartialApproval, String digitalAssetType) { return Authorize3dRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -305,6 +310,7 @@ public NuveiBaseRequest getAuthorize3dRequest(MerchantInfo merchantInfo, String .addExternalSchemeDetails(externalSchemeDetails) .addCurrencyConversion(currencyConversion) .addIsPartialApproval(isPartialApproval) + .addDigitalAssetType(digitalAssetType) .build(); } @@ -373,7 +379,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, - CurrencyConversion currencyConversion) { + CurrencyConversion currencyConversion, String digitalAssetType) { return PayoutRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -392,6 +398,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .addUserDetails(userDetails) .addCompanyDetails(companyDetails) .addCurrencyConversion(currencyConversion) + .addDigitalAssetType(digitalAssetType) .build(); } diff --git a/src/main/java/com/nuvei/biz/ServiceFactory.java b/src/main/java/com/nuvei/biz/ServiceFactory.java index 46057a0..1b53df2 100644 --- a/src/main/java/com/nuvei/biz/ServiceFactory.java +++ b/src/main/java/com/nuvei/biz/ServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; diff --git a/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java b/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java index a4b1856..939956f 100644 --- a/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java +++ b/src/main/java/com/nuvei/biz/simple/payment/SimpleAPMPayment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz.simple.payment; @@ -9,8 +9,8 @@ import com.nuvei.biz.NuveiRequestExecutor; import com.nuvei.model.MerchantInfo; import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.PaymentAPMRequest; import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.PaymentAPMRequest; import com.nuvei.response.PaymentsResponse; import com.nuvei.response.NuveiResponse; import com.nuvei.util.Constants; @@ -32,7 +32,7 @@ public class SimpleAPMPayment { /** * Even if this constructor allows the {@code merchantInfo} to be null, the payment request will fail due to missing parameters * - * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Nuvei + * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request 2007 - 2024 Nuvei Corporation */ public SimpleAPMPayment(MerchantInfo merchantInfo) { this.merchantInfo = merchantInfo; diff --git a/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java b/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java index a5c1bc5..60c7a29 100644 --- a/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java +++ b/src/main/java/com/nuvei/biz/simple/payment/SimpleCreditCardPayment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz.simple.payment; @@ -9,10 +9,10 @@ import com.nuvei.model.ExternalMpi; import com.nuvei.model.MerchantInfo; import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.PaymentCCRequest; import com.nuvei.request.NuveiBaseRequest; -import com.nuvei.response.PaymentsResponse; +import com.nuvei.request.PaymentCCRequest; import com.nuvei.response.NuveiResponse; +import com.nuvei.response.PaymentsResponse; import com.nuvei.util.Constants; /** @@ -31,7 +31,7 @@ public class SimpleCreditCardPayment { /** * Even if this constructor allows the {@code merchantInfo} to be null, the payment request will fail due to missing parameters * - * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request to Nuvei + * @param merchantInfo (required) A {@link MerchantInfo} object containing info needed to create a request 2007 - 2024 Nuvei Corporation */ public SimpleCreditCardPayment(MerchantInfo merchantInfo) { this.merchantInfo = merchantInfo; diff --git a/src/main/java/com/nuvei/exception/NuveiConfigurationException.java b/src/main/java/com/nuvei/exception/NuveiConfigurationException.java index 67b18fe..2602488 100644 --- a/src/main/java/com/nuvei/exception/NuveiConfigurationException.java +++ b/src/main/java/com/nuvei/exception/NuveiConfigurationException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.exception; diff --git a/src/main/java/com/nuvei/exception/NuveiException.java b/src/main/java/com/nuvei/exception/NuveiException.java index 14f1d51..c170182 100644 --- a/src/main/java/com/nuvei/exception/NuveiException.java +++ b/src/main/java/com/nuvei/exception/NuveiException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.exception; diff --git a/src/main/java/com/nuvei/model/Account.java b/src/main/java/com/nuvei/model/Account.java index 81f3b54..771d40b 100644 --- a/src/main/java/com/nuvei/model/Account.java +++ b/src/main/java/com/nuvei/model/Account.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Acquirer.java b/src/main/java/com/nuvei/model/Acquirer.java index 922aa8d..4c7ab39 100644 --- a/src/main/java/com/nuvei/model/Acquirer.java +++ b/src/main/java/com/nuvei/model/Acquirer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Addendums.java b/src/main/java/com/nuvei/model/Addendums.java index 7c96a45..59a5ac6 100644 --- a/src/main/java/com/nuvei/model/Addendums.java +++ b/src/main/java/com/nuvei/model/Addendums.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsAirlines.java b/src/main/java/com/nuvei/model/AddendumsAirlines.java index bebb538..e3ff503 100644 --- a/src/main/java/com/nuvei/model/AddendumsAirlines.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlines.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java index 0243aee..d24c86a 100644 --- a/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesFlightLegDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java index b07eebe..83ef351 100644 --- a/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesPassengerDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java b/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java index 2aa90bb..e94215f 100644 --- a/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlinesReservationDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java b/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java index dd8f1c6..24c34fc 100644 --- a/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java +++ b/src/main/java/com/nuvei/model/AddendumsCardPresentPointOfSale.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AddendumsLocalPayment.java b/src/main/java/com/nuvei/model/AddendumsLocalPayment.java index 89ad70a..ba7f9ea 100644 --- a/src/main/java/com/nuvei/model/AddendumsLocalPayment.java +++ b/src/main/java/com/nuvei/model/AddendumsLocalPayment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AmountDetails.java b/src/main/java/com/nuvei/model/AmountDetails.java index 60e6367..ea1dc89 100644 --- a/src/main/java/com/nuvei/model/AmountDetails.java +++ b/src/main/java/com/nuvei/model/AmountDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AmountInfo.java b/src/main/java/com/nuvei/model/AmountInfo.java index 3fcbe1c..3f58dae 100644 --- a/src/main/java/com/nuvei/model/AmountInfo.java +++ b/src/main/java/com/nuvei/model/AmountInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ApiExternalToken.java b/src/main/java/com/nuvei/model/ApiExternalToken.java index bdc315c..50a84fa 100644 --- a/src/main/java/com/nuvei/model/ApiExternalToken.java +++ b/src/main/java/com/nuvei/model/ApiExternalToken.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/AssuranceDetails.java b/src/main/java/com/nuvei/model/AssuranceDetails.java index d95f38b..8873018 100644 --- a/src/main/java/com/nuvei/model/AssuranceDetails.java +++ b/src/main/java/com/nuvei/model/AssuranceDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/BasePaymentOption.java b/src/main/java/com/nuvei/model/BasePaymentOption.java index 1841a35..808aa26 100644 --- a/src/main/java/com/nuvei/model/BasePaymentOption.java +++ b/src/main/java/com/nuvei/model/BasePaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/BillingAddress.java b/src/main/java/com/nuvei/model/BillingAddress.java index bbbafea..77b5c1b 100644 --- a/src/main/java/com/nuvei/model/BillingAddress.java +++ b/src/main/java/com/nuvei/model/BillingAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/BrowserDetails.java b/src/main/java/com/nuvei/model/BrowserDetails.java index f699d8c..52e4aec 100644 --- a/src/main/java/com/nuvei/model/BrowserDetails.java +++ b/src/main/java/com/nuvei/model/BrowserDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Card.java b/src/main/java/com/nuvei/model/Card.java index d3d74c1..1c5e3cd 100644 --- a/src/main/java/com/nuvei/model/Card.java +++ b/src/main/java/com/nuvei/model/Card.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/CardData.java b/src/main/java/com/nuvei/model/CardData.java index 4d3bd15..763d5ad 100644 --- a/src/main/java/com/nuvei/model/CardData.java +++ b/src/main/java/com/nuvei/model/CardData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/CardResponse.java b/src/main/java/com/nuvei/model/CardResponse.java index 513c4af..70e7db0 100644 --- a/src/main/java/com/nuvei/model/CardResponse.java +++ b/src/main/java/com/nuvei/model/CardResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java b/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java index 4fb0ea1..b290a34 100644 --- a/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java +++ b/src/main/java/com/nuvei/model/CashierPaymentMethodDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java b/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java index 0b615bb..a8a1af3 100644 --- a/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java +++ b/src/main/java/com/nuvei/model/CommonUserDetailsInfo.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/CurrencyConversion.java b/src/main/java/com/nuvei/model/CurrencyConversion.java index 2ad1c65..734485a 100644 --- a/src/main/java/com/nuvei/model/CurrencyConversion.java +++ b/src/main/java/com/nuvei/model/CurrencyConversion.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/DeviceDetails.java b/src/main/java/com/nuvei/model/DeviceDetails.java index a100194..00b5c13 100644 --- a/src/main/java/com/nuvei/model/DeviceDetails.java +++ b/src/main/java/com/nuvei/model/DeviceDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; @@ -30,7 +30,6 @@ public class DeviceDetails { @Size(max = 255, message = "browser size must be up to 45 characters long!") private String browser; - @Pattern(regexp = APIConstants.IP_ADDRESS_REGEX, message = "the entered value is not a valid ipAddress") private String ipAddress; private String deviceManufacturerIdentifier; diff --git a/src/main/java/com/nuvei/model/DynamicDescriptor.java b/src/main/java/com/nuvei/model/DynamicDescriptor.java index 725740e..f9b017f 100644 --- a/src/main/java/com/nuvei/model/DynamicDescriptor.java +++ b/src/main/java/com/nuvei/model/DynamicDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ExternalMpi.java b/src/main/java/com/nuvei/model/ExternalMpi.java index 876ee9f..29b2bdd 100644 --- a/src/main/java/com/nuvei/model/ExternalMpi.java +++ b/src/main/java/com/nuvei/model/ExternalMpi.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ExternalSchemeDetails.java b/src/main/java/com/nuvei/model/ExternalSchemeDetails.java index c3c9ed6..88d9178 100644 --- a/src/main/java/com/nuvei/model/ExternalSchemeDetails.java +++ b/src/main/java/com/nuvei/model/ExternalSchemeDetails.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ExternalToken.java b/src/main/java/com/nuvei/model/ExternalToken.java index 52f8862..0c4590d 100644 --- a/src/main/java/com/nuvei/model/ExternalToken.java +++ b/src/main/java/com/nuvei/model/ExternalToken.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ExternalTokenInfo.java b/src/main/java/com/nuvei/model/ExternalTokenInfo.java index 8d2c555..c0b9473 100644 --- a/src/main/java/com/nuvei/model/ExternalTokenInfo.java +++ b/src/main/java/com/nuvei/model/ExternalTokenInfo.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ExternalTokenProvider.java b/src/main/java/com/nuvei/model/ExternalTokenProvider.java index 7620c82..895c44a 100644 --- a/src/main/java/com/nuvei/model/ExternalTokenProvider.java +++ b/src/main/java/com/nuvei/model/ExternalTokenProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Field.java b/src/main/java/com/nuvei/model/Field.java index 23f4aed..362fc4e 100644 --- a/src/main/java/com/nuvei/model/Field.java +++ b/src/main/java/com/nuvei/model/Field.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/FraudDetails.java b/src/main/java/com/nuvei/model/FraudDetails.java index 5d61475..6d08742 100644 --- a/src/main/java/com/nuvei/model/FraudDetails.java +++ b/src/main/java/com/nuvei/model/FraudDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/FraudDetailsSystem.java b/src/main/java/com/nuvei/model/FraudDetailsSystem.java index bbba09a..81b84a7 100644 --- a/src/main/java/com/nuvei/model/FraudDetailsSystem.java +++ b/src/main/java/com/nuvei/model/FraudDetailsSystem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/FraudRule.java b/src/main/java/com/nuvei/model/FraudRule.java index bb6e7e8..9cd6e46 100644 --- a/src/main/java/com/nuvei/model/FraudRule.java +++ b/src/main/java/com/nuvei/model/FraudRule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/InitPaymentCard.java b/src/main/java/com/nuvei/model/InitPaymentCard.java index 34358e0..bec0411 100644 --- a/src/main/java/com/nuvei/model/InitPaymentCard.java +++ b/src/main/java/com/nuvei/model/InitPaymentCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java b/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java index 0f7aec1..5b4c4ac 100644 --- a/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java +++ b/src/main/java/com/nuvei/model/InitPaymentPaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/InitPaymentThreeD.java b/src/main/java/com/nuvei/model/InitPaymentThreeD.java index 51b6865..b17b253 100644 --- a/src/main/java/com/nuvei/model/InitPaymentThreeD.java +++ b/src/main/java/com/nuvei/model/InitPaymentThreeD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Item.java b/src/main/java/com/nuvei/model/Item.java index 07b22c9..6489299 100644 --- a/src/main/java/com/nuvei/model/Item.java +++ b/src/main/java/com/nuvei/model/Item.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/LocalizationMessage.java b/src/main/java/com/nuvei/model/LocalizationMessage.java index 782abe0..d2b91b7 100644 --- a/src/main/java/com/nuvei/model/LocalizationMessage.java +++ b/src/main/java/com/nuvei/model/LocalizationMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/MerchantBaseInfo.java b/src/main/java/com/nuvei/model/MerchantBaseInfo.java index a63fc5a..358a28c 100644 --- a/src/main/java/com/nuvei/model/MerchantBaseInfo.java +++ b/src/main/java/com/nuvei/model/MerchantBaseInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; @@ -29,7 +29,7 @@ public class MerchantBaseInfo { /** * Constructs a {@link MerchantInfo} object with data from the params. * - * @param merchantKey The secret merchant key obtained by the Merchant during integration process with nuvei + * @param merchantKey The secret merchant key obtained by the Merchant during integration process with Nuvei * @param serverHost The Nuvei's server address to send the request to * @param hashAlgorithm The hashing algorithm used to generate the checksum */ diff --git a/src/main/java/com/nuvei/model/MerchantDetails.java b/src/main/java/com/nuvei/model/MerchantDetails.java index e616014..13c1a8f 100644 --- a/src/main/java/com/nuvei/model/MerchantDetails.java +++ b/src/main/java/com/nuvei/model/MerchantDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/MerchantInfo.java b/src/main/java/com/nuvei/model/MerchantInfo.java index 4437d6e..66d4f85 100644 --- a/src/main/java/com/nuvei/model/MerchantInfo.java +++ b/src/main/java/com/nuvei/model/MerchantInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/OpenAmount.java b/src/main/java/com/nuvei/model/OpenAmount.java index 26ad347..dd1e014 100644 --- a/src/main/java/com/nuvei/model/OpenAmount.java +++ b/src/main/java/com/nuvei/model/OpenAmount.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/OpenOrderCard.java b/src/main/java/com/nuvei/model/OpenOrderCard.java index a9dc799..e3de955 100644 --- a/src/main/java/com/nuvei/model/OpenOrderCard.java +++ b/src/main/java/com/nuvei/model/OpenOrderCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java b/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java index 30023d7..63ba3f9 100644 --- a/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java +++ b/src/main/java/com/nuvei/model/OpenOrderPaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/OpenOrderThreeD.java b/src/main/java/com/nuvei/model/OpenOrderThreeD.java index 368d57d..4a2ad7e 100644 --- a/src/main/java/com/nuvei/model/OpenOrderThreeD.java +++ b/src/main/java/com/nuvei/model/OpenOrderThreeD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java b/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java index ad5fd9c..32a9b38 100644 --- a/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java +++ b/src/main/java/com/nuvei/model/OpenOrderThreeDV2AdditionalParams.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PartialApprovalDetails.java b/src/main/java/com/nuvei/model/PartialApprovalDetails.java index 66be93f..b7a0b43 100644 --- a/src/main/java/com/nuvei/model/PartialApprovalDetails.java +++ b/src/main/java/com/nuvei/model/PartialApprovalDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java b/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java index 914f4cf..d6a4f63 100644 --- a/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsAlternativePaymentMethod.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentDetailsCard.java b/src/main/java/com/nuvei/model/PaymentDetailsCard.java index 8bc8278..0b8f164 100644 --- a/src/main/java/com/nuvei/model/PaymentDetailsCard.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsCard.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java b/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java index e8f32b2..7b23f92 100644 --- a/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsPaymentOption.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java b/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java index 0454496..c5b9822 100644 --- a/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java +++ b/src/main/java/com/nuvei/model/PaymentDetailsThreeD.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentInfo.java b/src/main/java/com/nuvei/model/PaymentInfo.java index ecde2a8..13dd122 100644 --- a/src/main/java/com/nuvei/model/PaymentInfo.java +++ b/src/main/java/com/nuvei/model/PaymentInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentMethod.java b/src/main/java/com/nuvei/model/PaymentMethod.java index c9555e8..059c01f 100644 --- a/src/main/java/com/nuvei/model/PaymentMethod.java +++ b/src/main/java/com/nuvei/model/PaymentMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentMethodDetails.java b/src/main/java/com/nuvei/model/PaymentMethodDetails.java index 5c4902a..dcb34c1 100644 --- a/src/main/java/com/nuvei/model/PaymentMethodDetails.java +++ b/src/main/java/com/nuvei/model/PaymentMethodDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentOption.java b/src/main/java/com/nuvei/model/PaymentOption.java index b9c845f..8c924db 100644 --- a/src/main/java/com/nuvei/model/PaymentOption.java +++ b/src/main/java/com/nuvei/model/PaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/PaymentOptionResponse.java b/src/main/java/com/nuvei/model/PaymentOptionResponse.java index 4671b47..f200712 100644 --- a/src/main/java/com/nuvei/model/PaymentOptionResponse.java +++ b/src/main/java/com/nuvei/model/PaymentOptionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Proxy.java b/src/main/java/com/nuvei/model/Proxy.java index 7db0eac..28a4a31 100644 --- a/src/main/java/com/nuvei/model/Proxy.java +++ b/src/main/java/com/nuvei/model/Proxy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Rate.java b/src/main/java/com/nuvei/model/Rate.java index aa125af..16c0ba6 100644 --- a/src/main/java/com/nuvei/model/Rate.java +++ b/src/main/java/com/nuvei/model/Rate.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/RateByCurrency.java b/src/main/java/com/nuvei/model/RateByCurrency.java index 43a658b..5dee6d7 100644 --- a/src/main/java/com/nuvei/model/RateByCurrency.java +++ b/src/main/java/com/nuvei/model/RateByCurrency.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/RecipientDetails.java b/src/main/java/com/nuvei/model/RecipientDetails.java index 6251f9f..5012f6e 100644 --- a/src/main/java/com/nuvei/model/RecipientDetails.java +++ b/src/main/java/com/nuvei/model/RecipientDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/RefundPaymentOption.java b/src/main/java/com/nuvei/model/RefundPaymentOption.java index d0204d6..19db21e 100644 --- a/src/main/java/com/nuvei/model/RefundPaymentOption.java +++ b/src/main/java/com/nuvei/model/RefundPaymentOption.java @@ -1,9 +1,10 @@ package com.nuvei.model; +import com.nuvei.util.AtLeastOneFieldPresent; + import javax.validation.Valid; import javax.validation.constraints.Size; -import com.nuvei.util.AtLeastOneFieldPresent; @AtLeastOneFieldPresent(fields = {"card", "userPaymentOptionId"}, message = "Either \"card\" or \"userPaymentOptionId\" must be defined") public class RefundPaymentOption { diff --git a/src/main/java/com/nuvei/model/RestApiUserDetails.java b/src/main/java/com/nuvei/model/RestApiUserDetails.java index e9049bd..452123f 100644 --- a/src/main/java/com/nuvei/model/RestApiUserDetails.java +++ b/src/main/java/com/nuvei/model/RestApiUserDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Sdk.java b/src/main/java/com/nuvei/model/Sdk.java index aab01df..41ce51a 100644 --- a/src/main/java/com/nuvei/model/Sdk.java +++ b/src/main/java/com/nuvei/model/Sdk.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SdkResponse.java b/src/main/java/com/nuvei/model/SdkResponse.java index 62a4b8e..c639ef4 100644 --- a/src/main/java/com/nuvei/model/SdkResponse.java +++ b/src/main/java/com/nuvei/model/SdkResponse.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/StoredCredentials.java b/src/main/java/com/nuvei/model/StoredCredentials.java index 3724136..0645cd0 100644 --- a/src/main/java/com/nuvei/model/StoredCredentials.java +++ b/src/main/java/com/nuvei/model/StoredCredentials.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SubMerchant.java b/src/main/java/com/nuvei/model/SubMerchant.java index 4746f9d..b36fcdb 100644 --- a/src/main/java/com/nuvei/model/SubMerchant.java +++ b/src/main/java/com/nuvei/model/SubMerchant.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SubMethod.java b/src/main/java/com/nuvei/model/SubMethod.java index a54f250..a99e4d4 100644 --- a/src/main/java/com/nuvei/model/SubMethod.java +++ b/src/main/java/com/nuvei/model/SubMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SubMethodDetails.java b/src/main/java/com/nuvei/model/SubMethodDetails.java index cba3121..77782cb 100644 --- a/src/main/java/com/nuvei/model/SubMethodDetails.java +++ b/src/main/java/com/nuvei/model/SubMethodDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SubscriptionPlan.java b/src/main/java/com/nuvei/model/SubscriptionPlan.java index 99fb924..059934c 100644 --- a/src/main/java/com/nuvei/model/SubscriptionPlan.java +++ b/src/main/java/com/nuvei/model/SubscriptionPlan.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/SubscriptionsListElement.java b/src/main/java/com/nuvei/model/SubscriptionsListElement.java index f5fcf13..4121b1c 100644 --- a/src/main/java/com/nuvei/model/SubscriptionsListElement.java +++ b/src/main/java/com/nuvei/model/SubscriptionsListElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/ThreeD.java b/src/main/java/com/nuvei/model/ThreeD.java index 5fed957..5eb531f 100644 --- a/src/main/java/com/nuvei/model/ThreeD.java +++ b/src/main/java/com/nuvei/model/ThreeD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/TokenizationData.java b/src/main/java/com/nuvei/model/TokenizationData.java index 84cdfea..af8991b 100644 --- a/src/main/java/com/nuvei/model/TokenizationData.java +++ b/src/main/java/com/nuvei/model/TokenizationData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/UrlDetails.java b/src/main/java/com/nuvei/model/UrlDetails.java index fcc12cf..98d3bcb 100644 --- a/src/main/java/com/nuvei/model/UrlDetails.java +++ b/src/main/java/com/nuvei/model/UrlDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/UserAddress.java b/src/main/java/com/nuvei/model/UserAddress.java index 03387f8..44282c2 100644 --- a/src/main/java/com/nuvei/model/UserAddress.java +++ b/src/main/java/com/nuvei/model/UserAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/UserDetails.java b/src/main/java/com/nuvei/model/UserDetails.java index c8bac03..cdcdb07 100644 --- a/src/main/java/com/nuvei/model/UserDetails.java +++ b/src/main/java/com/nuvei/model/UserDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/UserDetailsCashier.java b/src/main/java/com/nuvei/model/UserDetailsCashier.java index 9c01887..5ae77f9 100644 --- a/src/main/java/com/nuvei/model/UserDetailsCashier.java +++ b/src/main/java/com/nuvei/model/UserDetailsCashier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/UserPaymentOption.java b/src/main/java/com/nuvei/model/UserPaymentOption.java index 16f1b67..5e11e09 100644 --- a/src/main/java/com/nuvei/model/UserPaymentOption.java +++ b/src/main/java/com/nuvei/model/UserPaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/V2AdditionalParams.java b/src/main/java/com/nuvei/model/V2AdditionalParams.java index 6fe34a2..4ce03ca 100644 --- a/src/main/java/com/nuvei/model/V2AdditionalParams.java +++ b/src/main/java/com/nuvei/model/V2AdditionalParams.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Verify3dCard.java b/src/main/java/com/nuvei/model/Verify3dCard.java index 10ecffc..4cc2f9c 100644 --- a/src/main/java/com/nuvei/model/Verify3dCard.java +++ b/src/main/java/com/nuvei/model/Verify3dCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Verify3dPaymentOption.java b/src/main/java/com/nuvei/model/Verify3dPaymentOption.java index 8ca072c..f3c3a31 100644 --- a/src/main/java/com/nuvei/model/Verify3dPaymentOption.java +++ b/src/main/java/com/nuvei/model/Verify3dPaymentOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/model/Verify3dThreeD.java b/src/main/java/com/nuvei/model/Verify3dThreeD.java index 0065d89..b71545d 100644 --- a/src/main/java/com/nuvei/model/Verify3dThreeD.java +++ b/src/main/java/com/nuvei/model/Verify3dThreeD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.model; diff --git a/src/main/java/com/nuvei/request/AccountCaptureRequest.java b/src/main/java/com/nuvei/request/AccountCaptureRequest.java index 7ba92e4..8638c55 100644 --- a/src/main/java/com/nuvei/request/AccountCaptureRequest.java +++ b/src/main/java/com/nuvei/request/AccountCaptureRequest.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/AddUPOAPMRequest.java b/src/main/java/com/nuvei/request/AddUPOAPMRequest.java index 16c4b75..677c228 100644 --- a/src/main/java/com/nuvei/request/AddUPOAPMRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOAPMRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java index fcd8d01..d4806c3 100644 --- a/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java index 9b9fc52..79aba1d 100644 --- a/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardByTokenRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java index e69966b..a970a6f 100644 --- a/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/Authorization3DRequest.java b/src/main/java/com/nuvei/request/Authorization3DRequest.java index 2e223d2..5ad4c8a 100644 --- a/src/main/java/com/nuvei/request/Authorization3DRequest.java +++ b/src/main/java/com/nuvei/request/Authorization3DRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java b/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java index 318a6b0..38453d2 100644 --- a/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java +++ b/src/main/java/com/nuvei/request/Authorize3dAndPaymentRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/Authorize3dRequest.java b/src/main/java/com/nuvei/request/Authorize3dRequest.java index 5097218..ba80c9a 100644 --- a/src/main/java/com/nuvei/request/Authorize3dRequest.java +++ b/src/main/java/com/nuvei/request/Authorize3dRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -33,7 +33,7 @@ public String toString() { sb.append("paymentOption=").append(getPaymentOption()) .append(", isRebilling=").append(getIsRebilling()) .append(", autoPayment3D=").append(isAutoPayment3D()) - .append("currency='").append(getCurrency()).append('\'') + .append(" currency='").append(getCurrency()).append('\'') .append(", amount='").append(getAmount()).append('\'') .append(", items=").append(getItems()) .append(", deviceDetails=").append(getDeviceDetails()) @@ -49,8 +49,8 @@ public String toString() { .append(", amountDetails='").append(getAmountDetails()) .append(", merchantId='").append(getMerchantId()).append('\'') .append(", merchantSiteId='").append(getMerchantSiteId()).append('\'') - .append("serverHost='").append(getServerHost()).append('\'') - .append("internalRequestId='").append(getInternalRequestId()).append('\'') + .append(", serverHost='").append(getServerHost()).append('\'') + .append(", internalRequestId='").append(getInternalRequestId()).append('\'') .append(", clientRequestId='").append(getClientRequestId()).append('\'') .append(", timeStamp='").append(getTimeStamp()).append('\'') .append(", checksum='").append(getChecksum()).append('\'') diff --git a/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java b/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java index 27fdb78..2e039ed 100644 --- a/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java +++ b/src/main/java/com/nuvei/request/CancelSubscriptionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -26,7 +26,7 @@ public class CancelSubscriptionRequest extends NuveiRequest { /** - * The ID of the user’s active subscription in the Nuvei’s system. + * The ID of the user’s active subscription in the Nuvei's system. */ @NotNull(message = "subscriptionId mustn't be null") @Size(max = 20, message = "subscriptionId value size must be up to 20 characters") @@ -82,7 +82,7 @@ public static class Builder extends NuveiBuilder { /** * Adds subscription Id to the request. * - * @param subscriptionId the ID of the user’s active subscription in the Nuvei’s system. + * @param subscriptionId the ID of the user’s active subscription in the Nuvei's system. * @return this object */ public CancelSubscriptionRequest.Builder addSubscriptionId(String subscriptionId) { diff --git a/src/main/java/com/nuvei/request/CardDetailsRequest.java b/src/main/java/com/nuvei/request/CardDetailsRequest.java index d0452a0..e4ba23e 100644 --- a/src/main/java/com/nuvei/request/CardDetailsRequest.java +++ b/src/main/java/com/nuvei/request/CardDetailsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/CardTokenizationRequest.java b/src/main/java/com/nuvei/request/CardTokenizationRequest.java index b5275cf..82f1134 100644 --- a/src/main/java/com/nuvei/request/CardTokenizationRequest.java +++ b/src/main/java/com/nuvei/request/CardTokenizationRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -64,7 +64,6 @@ public class CardTokenizationRequest extends NuveiBaseRequest { /** * TODO: Check if this is required param ?!? */ - @Pattern(regexp = APIConstants.IP_ADDRESS_REGEX, message = "the entered value is not a valid ipAddress") private String ipAddress; @Valid diff --git a/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java b/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java index 43886ca..a2aea82 100644 --- a/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java +++ b/src/main/java/com/nuvei/request/CreateSubscriptionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/CreateUserRequest.java b/src/main/java/com/nuvei/request/CreateUserRequest.java index 5f7c547..d65247e 100644 --- a/src/main/java/com/nuvei/request/CreateUserRequest.java +++ b/src/main/java/com/nuvei/request/CreateUserRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/DccDetailsRequest.java b/src/main/java/com/nuvei/request/DccDetailsRequest.java index f605eb3..1f8d6d8 100644 --- a/src/main/java/com/nuvei/request/DccDetailsRequest.java +++ b/src/main/java/com/nuvei/request/DccDetailsRequest.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/DeleteUPORequest.java b/src/main/java/com/nuvei/request/DeleteUPORequest.java index a4b2e1c..74d521e 100644 --- a/src/main/java/com/nuvei/request/DeleteUPORequest.java +++ b/src/main/java/com/nuvei/request/DeleteUPORequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/Dynamic3DRequest.java b/src/main/java/com/nuvei/request/Dynamic3DRequest.java index 54b77bf..89e5d55 100644 --- a/src/main/java/com/nuvei/request/Dynamic3DRequest.java +++ b/src/main/java/com/nuvei/request/Dynamic3DRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/EditUPOAPMRequest.java b/src/main/java/com/nuvei/request/EditUPOAPMRequest.java index a8ecb7f..f29b86b 100644 --- a/src/main/java/com/nuvei/request/EditUPOAPMRequest.java +++ b/src/main/java/com/nuvei/request/EditUPOAPMRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java b/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java index 12bc78c..2215ff0 100644 --- a/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java +++ b/src/main/java/com/nuvei/request/EditUPOCreditCardRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/EnableUPORequest.java b/src/main/java/com/nuvei/request/EnableUPORequest.java index 6c3764a..0c7f689 100644 --- a/src/main/java/com/nuvei/request/EnableUPORequest.java +++ b/src/main/java/com/nuvei/request/EnableUPORequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java b/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java index 44fb7fa..9f2cdd2 100644 --- a/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java +++ b/src/main/java/com/nuvei/request/GetMerchantPaymentMethodsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java b/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java index 17901bc..a57945b 100644 --- a/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java +++ b/src/main/java/com/nuvei/request/GetOrderDetailsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java b/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java index 5d85f25..9ba8abb 100644 --- a/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java +++ b/src/main/java/com/nuvei/request/GetPaymentStatusRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java b/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java index f9d1101..27b0158 100644 --- a/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java +++ b/src/main/java/com/nuvei/request/GetPayoutStatusRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetSessionTokenRequest.java b/src/main/java/com/nuvei/request/GetSessionTokenRequest.java index d5a0c57..1853dd1 100644 --- a/src/main/java/com/nuvei/request/GetSessionTokenRequest.java +++ b/src/main/java/com/nuvei/request/GetSessionTokenRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java b/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java index f7db6d1..2582fb2 100644 --- a/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java +++ b/src/main/java/com/nuvei/request/GetSubscriptionPlansRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -12,9 +12,9 @@ /** *

* Request to obtain available subscription plans for the merchant. - * Creating and updating subscription plans is possible using CPanel, Nuvei’s back-office tool. + * Creating and updating subscription plans is possible using CPanel, Nuvei's back-office tool. *

- * For more information, please contact Nuvei’s Integration Team at integration@nuvei.com + * For more information, please contact Nuvei's Integration Team at integration@nuvei.com * * @author Nikola Dichev * @see CreateSubscriptionRequest diff --git a/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java b/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java index 7d10f0a..22cd74c 100644 --- a/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java +++ b/src/main/java/com/nuvei/request/GetSubscriptionsListRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetUserDetailsRequest.java b/src/main/java/com/nuvei/request/GetUserDetailsRequest.java index 2b66cd1..cf98303 100644 --- a/src/main/java/com/nuvei/request/GetUserDetailsRequest.java +++ b/src/main/java/com/nuvei/request/GetUserDetailsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/GetUserUPOsRequest.java b/src/main/java/com/nuvei/request/GetUserUPOsRequest.java index 1789ec2..99c2912 100644 --- a/src/main/java/com/nuvei/request/GetUserUPOsRequest.java +++ b/src/main/java/com/nuvei/request/GetUserUPOsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/InitPaymentRequest.java b/src/main/java/com/nuvei/request/InitPaymentRequest.java index 824d62c..947d334 100644 --- a/src/main/java/com/nuvei/request/InitPaymentRequest.java +++ b/src/main/java/com/nuvei/request/InitPaymentRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -59,6 +59,9 @@ public class InitPaymentRequest extends NuveiRequest { @Size(max = 255) private String userId; + @Size(max = 19) + private String relatedTransactionId; + public String getUserTokenId() { return userTokenId; } @@ -155,6 +158,14 @@ public void setRecipientDetails(RecipientDetails recipientDetails) { this.recipientDetails = recipientDetails; } + public String getRelatedTransactionId() { + return relatedTransactionId; + } + + public void setRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder(); @@ -170,7 +181,8 @@ public String toString() { .append(", billingAddress=").append(billingAddress) .append(", aftOverride=").append(aftOverride) .append(", recipientDetails=").append(recipientDetails) - .append(", userId=").append(userId); + .append(", userId=").append(userId) + .append(", relatedTransactionId=").append(relatedTransactionId); return sb.toString(); } @@ -193,6 +205,7 @@ public static class Builder extends NuveiBuilder { private String userId; private String aftOverride; private RecipientDetails recipientDetails; + private String relatedTransactionId; public Builder addUserTokenId(String userTokenId) { this.userTokenId = userTokenId; @@ -254,6 +267,11 @@ public Builder addRecipientDetails(RecipientDetails recipientDetails) { return this; } + public Builder addRelatedTransactionId(String relatedTransactionId) { + this.relatedTransactionId = relatedTransactionId; + return this; + } + @Override public InitPaymentRequest build() throws ConstraintViolationException { InitPaymentRequest request = new InitPaymentRequest(); @@ -269,6 +287,7 @@ public InitPaymentRequest build() throws ConstraintViolationException { request.setUserId(userId); request.setAftOverride(aftOverride); request.setRecipientDetails(recipientDetails); + request.setRelatedTransactionId(relatedTransactionId); return ValidationUtils.validate(super.build(request)); } diff --git a/src/main/java/com/nuvei/request/McpRatesRequest.java b/src/main/java/com/nuvei/request/McpRatesRequest.java index 84e3023..fc44ffa 100644 --- a/src/main/java/com/nuvei/request/McpRatesRequest.java +++ b/src/main/java/com/nuvei/request/McpRatesRequest.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/NuveiBaseRequest.java b/src/main/java/com/nuvei/request/NuveiBaseRequest.java index 0a4c8ba..cf131e4 100644 --- a/src/main/java/com/nuvei/request/NuveiBaseRequest.java +++ b/src/main/java/com/nuvei/request/NuveiBaseRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -10,7 +10,7 @@ /** *

- * Abstract class to be used as a base for all of the requests to Nuvei's servers. + * Abstract class to be used as a base for all of the requests 2007 - 2024 Nuvei Corporation's servers. * * @author Nikola Dichev * @since 2/14/2017 @@ -114,7 +114,7 @@ public String toString() { sb.append("serverHost='") .append(serverHost) .append('\''); - sb.append("internalRequestId='") + sb.append(", internalRequestId='") .append(internalRequestId) .append('\''); sb.append(", clientRequestId='") diff --git a/src/main/java/com/nuvei/request/NuveiCCRequest.java b/src/main/java/com/nuvei/request/NuveiCCRequest.java index 50012a5..6f0d22e 100644 --- a/src/main/java/com/nuvei/request/NuveiCCRequest.java +++ b/src/main/java/com/nuvei/request/NuveiCCRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java b/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java index 1c5025d..6d25d84 100644 --- a/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java +++ b/src/main/java/com/nuvei/request/NuveiOrderDetailsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -111,6 +111,8 @@ public abstract class NuveiOrderDetailsRequest extends NuveiRequest { private ShippingTrackingDetails shippingTrackingDetails; + private String digitalAssetType; + @NotNull(message = "sessionToken parameter is mandatory!") public String getSessionToken() { return super.getSessionToken(); @@ -243,42 +245,33 @@ public void setShippingTrackingDetails(ShippingTrackingDetails shippingTrackingD this.shippingTrackingDetails = shippingTrackingDetails; } + public String getDigitalAssetType() { + return digitalAssetType; + } + + public void setDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder(); - sb.append("currency='") - .append(currency) - .append('\''); - sb.append(", amount='") - .append(amount) - .append('\''); - sb.append(", items=") - .append(items); - sb.append(", deviceDetails=") - .append(deviceDetails); - sb.append(", userDetails=") - .append(userDetails); - sb.append(", shippingAddress=") - .append(shippingAddress); - sb.append(", billingAddress=") - .append(billingAddress); - sb.append(", dynamicDescriptor=") - .append(dynamicDescriptor); - sb.append(", merchantDetails=") - .append(merchantDetails); - sb.append(", urlDetails=") - .append(urlDetails); - sb.append(", addendums=") - .append(addendums); - sb.append(", userTokenId='") - .append(userTokenId) - .append('\''); - sb.append(", clientUniqueId='") - .append(clientUniqueId); - sb.append(", amountDetails='") - .append(amountDetails); - sb.append(", shippingTrackingDetails='") - .append(shippingTrackingDetails); + sb.append("currency='").append(currency).append('\''); + sb.append(", amount='").append(amount).append('\''); + sb.append(", items=").append(items); + sb.append(", deviceDetails=").append(deviceDetails); + sb.append(", userDetails=").append(userDetails); + sb.append(", shippingAddress=").append(shippingAddress); + sb.append(", billingAddress=").append(billingAddress); + sb.append(", dynamicDescriptor=").append(dynamicDescriptor); + sb.append(", merchantDetails=").append(merchantDetails); + sb.append(", urlDetails=").append(urlDetails); + sb.append(", addendums=").append(addendums); + sb.append(", userTokenId='").append(userTokenId).append('\''); + sb.append(", clientUniqueId='").append(clientUniqueId).append('\''); + sb.append(", amountDetails=").append(amountDetails); + sb.append(", shippingTrackingDetails=").append(shippingTrackingDetails); + sb.append(", digitalAssetType=").append(digitalAssetType); sb.append(", "); sb.append(super.toString()); return sb.toString(); diff --git a/src/main/java/com/nuvei/request/NuveiOrderRequest.java b/src/main/java/com/nuvei/request/NuveiOrderRequest.java index 701608d..af746c7 100644 --- a/src/main/java/com/nuvei/request/NuveiOrderRequest.java +++ b/src/main/java/com/nuvei/request/NuveiOrderRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/NuveiPaymentRequest.java b/src/main/java/com/nuvei/request/NuveiPaymentRequest.java index c38fa63..f717bd0 100644 --- a/src/main/java/com/nuvei/request/NuveiPaymentRequest.java +++ b/src/main/java/com/nuvei/request/NuveiPaymentRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/NuveiRequest.java b/src/main/java/com/nuvei/request/NuveiRequest.java index 9d7053b..1086104 100644 --- a/src/main/java/com/nuvei/request/NuveiRequest.java +++ b/src/main/java/com/nuvei/request/NuveiRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -8,7 +8,7 @@ /** *

- * Abstract class to be used as a base for all of the requests to Nuvei's servers. + * Abstract class to be used as a base for all of the requests 2007 - 2024 Nuvei Corporation's servers. *

* @author Nikola Dichev * @since 2/14/2017 diff --git a/src/main/java/com/nuvei/request/NuveiTransactionRequest.java b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java index 81ed750..36dbbea 100644 --- a/src/main/java/com/nuvei/request/NuveiTransactionRequest.java +++ b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/OpenOrderRequest.java b/src/main/java/com/nuvei/request/OpenOrderRequest.java index 72f70c8..fa05be8 100644 --- a/src/main/java/com/nuvei/request/OpenOrderRequest.java +++ b/src/main/java/com/nuvei/request/OpenOrderRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/OrderRequestWithDetails.java b/src/main/java/com/nuvei/request/OrderRequestWithDetails.java index f52c611..17e801a 100644 --- a/src/main/java/com/nuvei/request/OrderRequestWithDetails.java +++ b/src/main/java/com/nuvei/request/OrderRequestWithDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -142,16 +142,16 @@ public Boolean getAutoPayment3D() { @Override public String toString() { final StringBuilder sb = new StringBuilder("OrderRequestWithDetails{"); - sb.append("paymentMethod='").append(paymentMethod) + sb.append("paymentMethod=").append(paymentMethod) .append(", userPaymentOption=").append(userPaymentOption) - .append(", customData='").append(customData) + .append(", customData=").append(customData) .append(", autoPayment3D=").append(autoPayment3D) - .append(", isMoto='").append(isMoto) - .append(", userId='").append(userId) - .append(", externalSchemeDetails='").append(externalSchemeDetails) - .append(", currencyConversion='").append(currencyConversion) - .append(", openAmount='").append(openAmount) - .append(", aftOverride='").append(aftOverride); + .append(", isMoto=").append(isMoto) + .append(", userId=").append(userId) + .append(", externalSchemeDetails=").append(externalSchemeDetails) + .append(", currencyConversion=").append(currencyConversion) + .append(", openAmount=").append(openAmount) + .append(", aftOverride=").append(aftOverride); sb.append(super.toString()); return sb.toString(); diff --git a/src/main/java/com/nuvei/request/Payment3DRequest.java b/src/main/java/com/nuvei/request/Payment3DRequest.java index 548ae2a..3c36def 100644 --- a/src/main/java/com/nuvei/request/Payment3DRequest.java +++ b/src/main/java/com/nuvei/request/Payment3DRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/PaymentAPMRequest.java b/src/main/java/com/nuvei/request/PaymentAPMRequest.java index 3e41c00..9d95efa 100644 --- a/src/main/java/com/nuvei/request/PaymentAPMRequest.java +++ b/src/main/java/com/nuvei/request/PaymentAPMRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -29,7 +29,7 @@ * Following a positive response from the paymentAPM request, per output parameter {@code transactionStatus} returned value, * the merchant is redirected to the APM’s payment page (using {@code redirectUrl}) to login and confirm the billing information. *
  • The APM required actions (for APM’s who use redirect). Once the credentials are typed and the payment is confirmed, - * the APM redirects (with some additional information) back to Nuvei’s gateway using a {@code returnUrl} from previous APM-Nuvei + * the APM redirects (with some additional information) back 2007 - 2024 Nuvei Corporation’s gateway using a {@code returnUrl} from previous APM-Nuvei * communications at 1st stage. Afterwards, the Nuvei gateway redirects to a {@code successURL} or to a {@code failureURL}.
    • * * @@ -160,7 +160,7 @@ public Builder addOrderId(String orderId) { /** * Adds the payment method name to the request. * - * @param paymentMethod Nuvei’s unique name of the payment method. For a list of possible payment methods check + * @param paymentMethod Nuvei's unique name of the payment method. For a list of possible payment methods check * APM Unique Nuvei Names. * @return this object */ @@ -172,7 +172,7 @@ public Builder addPaymentMethod(String paymentMethod) { /** * Adds user account details to the request. Those details are related to the user's APM account and not the Nuvei's account. * - * @param userAccountDetails Nuvei’s account identifiers of the payment method's details. For more information, see + * @param userAccountDetails Nuvei's account identifiers of the payment method's details. For more information, see * APM Account Identifiers. * @return this object */ diff --git a/src/main/java/com/nuvei/request/PaymentCCRequest.java b/src/main/java/com/nuvei/request/PaymentCCRequest.java index 4cafb78..d00d5f6 100644 --- a/src/main/java/com/nuvei/request/PaymentCCRequest.java +++ b/src/main/java/com/nuvei/request/PaymentCCRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/PaymentRequest.java b/src/main/java/com/nuvei/request/PaymentRequest.java index 245537d..404958c 100644 --- a/src/main/java/com/nuvei/request/PaymentRequest.java +++ b/src/main/java/com/nuvei/request/PaymentRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/PayoutRequest.java b/src/main/java/com/nuvei/request/PayoutRequest.java index 025a352..f892c94 100644 --- a/src/main/java/com/nuvei/request/PayoutRequest.java +++ b/src/main/java/com/nuvei/request/PayoutRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -88,6 +88,8 @@ public class PayoutRequest extends NuveiRequest { @Valid private CurrencyConversion currencyConversion; + private String digitalAssetType; + public static PayoutRequest.Builder builder() { return new PayoutRequest.Builder(); } @@ -212,6 +214,14 @@ public void setCurrencyConversion(CurrencyConversion currencyConversion) { this.currencyConversion = currencyConversion; } + public String getDigitalAssetType() { + return digitalAssetType; + } + + public void setDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PayoutRequest{"); @@ -225,11 +235,12 @@ public String toString() { sb.append(", merchantDetails=").append(merchantDetails); sb.append(", urlDetails=").append(urlDetails); sb.append(", subMethodDetails=").append(subMethodDetails); - sb.append(", cardData='").append(cardData); - sb.append(", deviceDetails='").append(deviceDetails); - sb.append(", userDetails='").append(userDetails); - sb.append(", companyDetails='").append(companyDetails); - sb.append(", currencyConversion='").append(currencyConversion); + sb.append(", cardData=").append(cardData); + sb.append(", deviceDetails=").append(deviceDetails); + sb.append(", userDetails=").append(userDetails); + sb.append(", companyDetails=").append(companyDetails); + sb.append(", currencyConversion=").append(currencyConversion) + .append(", digitalAssetType=").append(digitalAssetType); sb.append('}'); return sb.toString(); } @@ -251,6 +262,7 @@ public static class Builder extends NuveiBuilder { private UserDetails userDetails; private CompanyDetails companyDetails; private CurrencyConversion currencyConversion; + private String digitalAssetType; /** * @param userTokenId @@ -372,6 +384,11 @@ public Builder addCurrencyConversion(CurrencyConversion currencyConversion) { return this; } + public Builder addDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + return this; + } + /** * Builds the request. * @@ -395,6 +412,7 @@ public PayoutRequest build() { request.setUserDetails(userDetails); request.setCompanyDetails(companyDetails); request.setCurrencyConversion(currencyConversion); + request.setDigitalAssetType(digitalAssetType); return ValidationUtils.validate(super.build(request)); } } diff --git a/src/main/java/com/nuvei/request/RefundTransactionRequest.java b/src/main/java/com/nuvei/request/RefundTransactionRequest.java index f00909b..581af54 100644 --- a/src/main/java/com/nuvei/request/RefundTransactionRequest.java +++ b/src/main/java/com/nuvei/request/RefundTransactionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -8,12 +8,12 @@ import javax.validation.Valid; import javax.validation.constraints.Size; +import com.nuvei.model.RefundPaymentOption; import com.nuvei.request.builder.NuveiTransactionBuilder; +import com.nuvei.util.AtLeastOneFieldPresent; import com.nuvei.util.Constants; import com.nuvei.util.ValidChecksum; import com.nuvei.util.ValidationUtils; -import com.nuvei.model.RefundPaymentOption; -import com.nuvei.util.AtLeastOneFieldPresent; /** *

    diff --git a/src/main/java/com/nuvei/request/SettleTransactionRequest.java b/src/main/java/com/nuvei/request/SettleTransactionRequest.java index a3cd323..11262fa 100644 --- a/src/main/java/com/nuvei/request/SettleTransactionRequest.java +++ b/src/main/java/com/nuvei/request/SettleTransactionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/SuspendUPORequest.java b/src/main/java/com/nuvei/request/SuspendUPORequest.java index 2568406..1caed87 100644 --- a/src/main/java/com/nuvei/request/SuspendUPORequest.java +++ b/src/main/java/com/nuvei/request/SuspendUPORequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/UpdateOrderRequest.java b/src/main/java/com/nuvei/request/UpdateOrderRequest.java index 3e1dcb4..99b854f 100644 --- a/src/main/java/com/nuvei/request/UpdateOrderRequest.java +++ b/src/main/java/com/nuvei/request/UpdateOrderRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/UpdateUserRequest.java b/src/main/java/com/nuvei/request/UpdateUserRequest.java index c6b2812..03ab51c 100644 --- a/src/main/java/com/nuvei/request/UpdateUserRequest.java +++ b/src/main/java/com/nuvei/request/UpdateUserRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/Verify3dRequest.java b/src/main/java/com/nuvei/request/Verify3dRequest.java index 07b4f05..0caa959 100644 --- a/src/main/java/com/nuvei/request/Verify3dRequest.java +++ b/src/main/java/com/nuvei/request/Verify3dRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; @@ -71,6 +71,8 @@ public class Verify3dRequest extends NuveiRequest { @Valid private SubMerchant subMerchant; + private String digitalAssetType; + public String getUserTokenId() { return userTokenId; } @@ -167,6 +169,14 @@ public void setSubMerchant(SubMerchant subMerchant) { this.subMerchant = subMerchant; } + public String getDigitalAssetType() { + return digitalAssetType; + } + + public void setDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + } + public static Builder builder() { return new Builder(); } @@ -193,6 +203,7 @@ public static class Builder extends NuveiBuilder { private Verify3dPaymentOption paymentOption; private String userId; private SubMerchant subMerchant; + private String digitalAssetType; public Builder addUserTokenId(String userTokenId) { this.userTokenId = userTokenId; @@ -254,6 +265,11 @@ public Builder addSubMerchant(SubMerchant subMerchant) { return this; } + public Builder addDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + return this; + } + @Override public NuveiBaseRequest build() throws ConstraintViolationException { Verify3dRequest verify3dRequest = new Verify3dRequest(); @@ -269,6 +285,7 @@ public NuveiBaseRequest build() throws ConstraintViolationException { verify3dRequest.setSubMerchant(subMerchant); verify3dRequest.setUserId(userId); verify3dRequest.setUserTokenId(userTokenId); + verify3dRequest.setDigitalAssetType(digitalAssetType); return ValidationUtils.validate(super.build(verify3dRequest)); } diff --git a/src/main/java/com/nuvei/request/VoidTransactionRequest.java b/src/main/java/com/nuvei/request/VoidTransactionRequest.java index 51f9d52..3c3f132 100644 --- a/src/main/java/com/nuvei/request/VoidTransactionRequest.java +++ b/src/main/java/com/nuvei/request/VoidTransactionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request; diff --git a/src/main/java/com/nuvei/request/basic/CashierUserRequest.java b/src/main/java/com/nuvei/request/basic/CashierUserRequest.java index 1104a3d..2585f8f 100644 --- a/src/main/java/com/nuvei/request/basic/CashierUserRequest.java +++ b/src/main/java/com/nuvei/request/basic/CashierUserRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.basic; diff --git a/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java b/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java index 3842ae4..5d9cc36 100644 --- a/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java +++ b/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.basic; @@ -7,13 +7,8 @@ import javax.validation.ConstraintViolationException; import javax.validation.constraints.NotNull; -import com.nuvei.request.DeleteUPORequest; -import com.nuvei.request.EditUPOAPMRequest; -import com.nuvei.request.EditUPOCreditCardRequest; -import com.nuvei.request.EnableUPORequest; +import com.nuvei.request.*; import com.nuvei.request.NuveiBaseRequest; -import com.nuvei.request.NuveiRequest; -import com.nuvei.request.SuspendUPORequest; import com.nuvei.request.builder.NuveiBuilder; import com.nuvei.util.Constants; import com.nuvei.util.ValidationUtils; diff --git a/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java index e3de00e..9e3e0c0 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBaseBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; @@ -14,7 +14,7 @@ /** *

    - * A base builder class for a request to Nuvei. + * A base builder class for a request 2007 - 2024 Nuvei Corporation. * * @author Bozhidar Shumanov * @see NuveiBuilder @@ -29,7 +29,7 @@ public abstract class NuveiBaseBuilder> { /** * Adds previously obtained {@code sessionToken} to the request. All requests(except the one to obtain session token) - * to Nuvei's API require a valid session token. Some requests (such as Payment*) consume it. + * 2007 - 2024 Nuvei Corporation's API require a valid session token. Some requests (such as Payment*) consume it. * * @param sessionToken Previously obtained session token as {@link String} * @return this object @@ -92,7 +92,7 @@ public T addMerchantInfo(String merchantKey, String serverHost, Constants.HashAl /** * Adds the common data, collected by this builder. The intent of this method is to be used from the derived classes. * - * @param NuveiBaseRequest an already created request of type <{@code T} extends {@link NuveiBaseRequest}> + * @param nuveiBaseRequest an already created request of type <{@code T} extends {@link NuveiBaseRequest}> * @param type parameter * @return the passed {@code nuveiBaseRequest} filled with the data from this builder */ diff --git a/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java index 1dc0025..29f456d 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBaseOrderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; @@ -472,7 +472,7 @@ public T addAmountDetails(String totalHandling, String totalShipping, String tot /** * Adds the order details data, collected by this builder. * - * @param NuveiOrderDetailsRequest an already created request of type T + * @param nuveiOrderDetailsRequest an already created request of type T * @param type parameter * @return this object */ diff --git a/src/main/java/com/nuvei/request/builder/NuveiBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiBuilder.java index c3cf0de..42abffe 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; @@ -15,7 +15,7 @@ /** *

    - * A base builder class for a request to Nuvei. + * A base builder class for a request 2007 - 2024 Nuvei Corporation. * * @author Nikola Dichev * @see NuveiCCBuilder @@ -32,7 +32,7 @@ public abstract class NuveiBuilder> { /** * Adds previously obtained {@code sessionToken} to the request. All requests(except the one to obtain session token) - * to Nuvei's API require a valid session token. Some requests (such as Payment*) consume it. + * 2007 - 2024 Nuvei Corporation's API require a valid session token. Some requests (such as Payment*) consume it. * * @param sessionToken Previously obtained session token as {@link String} * @return this object diff --git a/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java index 81b1b18..4d601f5 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiCCBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java index eb404ae..5811403 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiCashierUserBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java index a94454c..a2a5f54 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiOrderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; @@ -52,6 +52,7 @@ public abstract class NuveiOrderBuilder> extends private String clientUniqueId; private AmountDetails amountDetails; private ShippingTrackingDetails shippingTrackingDetails; + private String digitalAssetType; /** * Adds amount to the request. @@ -484,6 +485,18 @@ public T addShippingTrackingDetails(ShippingTrackingDetails shippingTrackingDeta return (T) this; } + + /** + * Adds digitalAssetType to the request. + * + * @param digitalAssetType Digital currency transaction identifier. + * @return this object + */ + public T addDigitalAssetType(String digitalAssetType) { + this.digitalAssetType = digitalAssetType; + return (T) this; + } + /** * Adds the order details data, collected by this builder. * @@ -512,6 +525,7 @@ protected S build(S nuveiOrderDetailsReques nuveiOrderDetailsRequest.setClientUniqueId(clientUniqueId); nuveiOrderDetailsRequest.setAmountDetails(amountDetails); nuveiOrderDetailsRequest.setShippingTrackingDetails(shippingTrackingDetails); + nuveiOrderDetailsRequest.setDigitalAssetType(digitalAssetType); nuveiOrderDetailsRequest.setChecksum( ChecksumUtils.calculateChecksum(nuveiOrderDetailsRequest, merchantInfo != null ? merchantInfo.getMerchantKey() : "", diff --git a/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java index d07830a..bceae4a 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiOrderWithDetailsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java index c5aba33..f97b638 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiPaymentBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java b/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java index b4727b2..866a298 100644 --- a/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java +++ b/src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/request/builder/PaymentBuilder.java b/src/main/java/com/nuvei/request/builder/PaymentBuilder.java index 48c4dd5..5e72402 100644 --- a/src/main/java/com/nuvei/request/builder/PaymentBuilder.java +++ b/src/main/java/com/nuvei/request/builder/PaymentBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.request.builder; diff --git a/src/main/java/com/nuvei/response/AccountCaptureResponse.java b/src/main/java/com/nuvei/response/AccountCaptureResponse.java index 15ef3c6..5d02aca 100644 --- a/src/main/java/com/nuvei/response/AccountCaptureResponse.java +++ b/src/main/java/com/nuvei/response/AccountCaptureResponse.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/AddUPOAPMResponse.java b/src/main/java/com/nuvei/response/AddUPOAPMResponse.java index ba70e11..34fbede 100644 --- a/src/main/java/com/nuvei/response/AddUPOAPMResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOAPMResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java index 1298670..47ae97b 100644 --- a/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardByTempTokenResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java index cd9d207..263f988 100644 --- a/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardByTokenResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java b/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java index 1c10d10..c924278 100644 --- a/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java +++ b/src/main/java/com/nuvei/response/AddUPOCreditCardResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Authorization3DResponse.java b/src/main/java/com/nuvei/response/Authorization3DResponse.java index 545fd1f..227583e 100644 --- a/src/main/java/com/nuvei/response/Authorization3DResponse.java +++ b/src/main/java/com/nuvei/response/Authorization3DResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java b/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java index b23433b..89e06fe 100644 --- a/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java +++ b/src/main/java/com/nuvei/response/Authorize3dAndPaymentResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Authorize3dResponse.java b/src/main/java/com/nuvei/response/Authorize3dResponse.java index 6701f8f..41b132e 100644 --- a/src/main/java/com/nuvei/response/Authorize3dResponse.java +++ b/src/main/java/com/nuvei/response/Authorize3dResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java b/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java index dfcfa45..95ff36a 100644 --- a/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java +++ b/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/CardDetailsResponse.java b/src/main/java/com/nuvei/response/CardDetailsResponse.java index 1e97b96..6bf8eec 100644 --- a/src/main/java/com/nuvei/response/CardDetailsResponse.java +++ b/src/main/java/com/nuvei/response/CardDetailsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/CardTokenizationResponse.java b/src/main/java/com/nuvei/response/CardTokenizationResponse.java index 6e1a327..b83a0bc 100644 --- a/src/main/java/com/nuvei/response/CardTokenizationResponse.java +++ b/src/main/java/com/nuvei/response/CardTokenizationResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java b/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java index 12f170a..b8c045b 100644 --- a/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java +++ b/src/main/java/com/nuvei/response/CreateSubscriptionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/DccDetailsResponse.java b/src/main/java/com/nuvei/response/DccDetailsResponse.java index 9ae0ca7..aff8ea1 100644 --- a/src/main/java/com/nuvei/response/DccDetailsResponse.java +++ b/src/main/java/com/nuvei/response/DccDetailsResponse.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/DeleteUPOResponse.java b/src/main/java/com/nuvei/response/DeleteUPOResponse.java index 73025d9..1863f85 100644 --- a/src/main/java/com/nuvei/response/DeleteUPOResponse.java +++ b/src/main/java/com/nuvei/response/DeleteUPOResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Dynamic3DResponse.java b/src/main/java/com/nuvei/response/Dynamic3DResponse.java index 3262d38..6320e23 100644 --- a/src/main/java/com/nuvei/response/Dynamic3DResponse.java +++ b/src/main/java/com/nuvei/response/Dynamic3DResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/EditUPOAPMResponse.java b/src/main/java/com/nuvei/response/EditUPOAPMResponse.java index 327417e..d2cba1a 100644 --- a/src/main/java/com/nuvei/response/EditUPOAPMResponse.java +++ b/src/main/java/com/nuvei/response/EditUPOAPMResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java b/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java index 2199a6a..2f0e3bb 100644 --- a/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java +++ b/src/main/java/com/nuvei/response/EditUPOCreditCardResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/EnableUPOResponse.java b/src/main/java/com/nuvei/response/EnableUPOResponse.java index a25a23c..be489ed 100644 --- a/src/main/java/com/nuvei/response/EnableUPOResponse.java +++ b/src/main/java/com/nuvei/response/EnableUPOResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java b/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java index 3f9292b..cc100f1 100644 --- a/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java +++ b/src/main/java/com/nuvei/response/GetMerchantPaymentMethodsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java b/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java index 7be67c5..b3ab9ce 100644 --- a/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java +++ b/src/main/java/com/nuvei/response/GetOrderDetailsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java b/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java index 02300de..4fc265d 100644 --- a/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java +++ b/src/main/java/com/nuvei/response/GetPaymentStatusResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; @@ -43,6 +43,8 @@ public class GetPaymentStatusResponse extends NuveiResponse { private String issuerDeclineReason; + private String externalSchemeTransactionId; + public String getCustomData() { return customData; } @@ -178,4 +180,12 @@ public String getIssuerDeclineReason() { public void setIssuerDeclineReason(String issuerDeclineReason) { this.issuerDeclineReason = issuerDeclineReason; } + + public String getExternalSchemeTransactionId() { + return externalSchemeTransactionId; + } + + public void setExternalSchemeTransactionId(String externalSchemeTransactionId) { + this.externalSchemeTransactionId = externalSchemeTransactionId; + } } diff --git a/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java b/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java index 917543e..e62fc3d 100644 --- a/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java +++ b/src/main/java/com/nuvei/response/GetPayoutStatusResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetSessionTokenResponse.java b/src/main/java/com/nuvei/response/GetSessionTokenResponse.java index fdd3451..b2cf946 100644 --- a/src/main/java/com/nuvei/response/GetSessionTokenResponse.java +++ b/src/main/java/com/nuvei/response/GetSessionTokenResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java b/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java index 64afdad..29dd97a 100644 --- a/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java +++ b/src/main/java/com/nuvei/response/GetSubscriptionPlansResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java b/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java index 5ab4bdc..301e9a0 100644 --- a/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java +++ b/src/main/java/com/nuvei/response/GetSubscriptionsListResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetUserDetailsResponse.java b/src/main/java/com/nuvei/response/GetUserDetailsResponse.java index ab57678..f08f560 100644 --- a/src/main/java/com/nuvei/response/GetUserDetailsResponse.java +++ b/src/main/java/com/nuvei/response/GetUserDetailsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/GetUserUPOsResponse.java b/src/main/java/com/nuvei/response/GetUserUPOsResponse.java index 74d7acc..a203a17 100644 --- a/src/main/java/com/nuvei/response/GetUserUPOsResponse.java +++ b/src/main/java/com/nuvei/response/GetUserUPOsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/InitPaymentResponse.java b/src/main/java/com/nuvei/response/InitPaymentResponse.java index f194449..ff68285 100644 --- a/src/main/java/com/nuvei/response/InitPaymentResponse.java +++ b/src/main/java/com/nuvei/response/InitPaymentResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/McpRatesResponse.java b/src/main/java/com/nuvei/response/McpRatesResponse.java index 9cce376..4a7f5e8 100644 --- a/src/main/java/com/nuvei/response/McpRatesResponse.java +++ b/src/main/java/com/nuvei/response/McpRatesResponse.java @@ -1,7 +1,7 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/NuveiOrderResponse.java b/src/main/java/com/nuvei/response/NuveiOrderResponse.java index 7aa8f24..eb54eb0 100644 --- a/src/main/java/com/nuvei/response/NuveiOrderResponse.java +++ b/src/main/java/com/nuvei/response/NuveiOrderResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/NuveiResponse.java b/src/main/java/com/nuvei/response/NuveiResponse.java index 8193078..3018187 100644 --- a/src/main/java/com/nuvei/response/NuveiResponse.java +++ b/src/main/java/com/nuvei/response/NuveiResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/NuveiTransactionResponse.java b/src/main/java/com/nuvei/response/NuveiTransactionResponse.java index d6ebbd8..6b3cc87 100644 --- a/src/main/java/com/nuvei/response/NuveiTransactionResponse.java +++ b/src/main/java/com/nuvei/response/NuveiTransactionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/OpenOrderResponse.java b/src/main/java/com/nuvei/response/OpenOrderResponse.java index 47de792..e653c1d 100644 --- a/src/main/java/com/nuvei/response/OpenOrderResponse.java +++ b/src/main/java/com/nuvei/response/OpenOrderResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Payment3DResponse.java b/src/main/java/com/nuvei/response/Payment3DResponse.java index ce69ffe..8c03a24 100644 --- a/src/main/java/com/nuvei/response/Payment3DResponse.java +++ b/src/main/java/com/nuvei/response/Payment3DResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PaymentAPMResponse.java b/src/main/java/com/nuvei/response/PaymentAPMResponse.java index fc85a7b..3c65914 100644 --- a/src/main/java/com/nuvei/response/PaymentAPMResponse.java +++ b/src/main/java/com/nuvei/response/PaymentAPMResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PaymentCCResponse.java b/src/main/java/com/nuvei/response/PaymentCCResponse.java index f29d66b..a512537 100644 --- a/src/main/java/com/nuvei/response/PaymentCCResponse.java +++ b/src/main/java/com/nuvei/response/PaymentCCResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PaymentResponse.java b/src/main/java/com/nuvei/response/PaymentResponse.java index eff4e60..15fd1ef 100644 --- a/src/main/java/com/nuvei/response/PaymentResponse.java +++ b/src/main/java/com/nuvei/response/PaymentResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PaymentsCCResponse.java b/src/main/java/com/nuvei/response/PaymentsCCResponse.java index 4d0568a..8faf503 100644 --- a/src/main/java/com/nuvei/response/PaymentsCCResponse.java +++ b/src/main/java/com/nuvei/response/PaymentsCCResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PaymentsResponse.java b/src/main/java/com/nuvei/response/PaymentsResponse.java index 6919f1a..c683ed5 100644 --- a/src/main/java/com/nuvei/response/PaymentsResponse.java +++ b/src/main/java/com/nuvei/response/PaymentsResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/PayoutResponse.java b/src/main/java/com/nuvei/response/PayoutResponse.java index 8d284aa..4bcaa49 100644 --- a/src/main/java/com/nuvei/response/PayoutResponse.java +++ b/src/main/java/com/nuvei/response/PayoutResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/RefundTransactionResponse.java b/src/main/java/com/nuvei/response/RefundTransactionResponse.java index 7f4daa0..da32418 100644 --- a/src/main/java/com/nuvei/response/RefundTransactionResponse.java +++ b/src/main/java/com/nuvei/response/RefundTransactionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/SettleTransactionResponse.java b/src/main/java/com/nuvei/response/SettleTransactionResponse.java index 649396d..5ab2be8 100644 --- a/src/main/java/com/nuvei/response/SettleTransactionResponse.java +++ b/src/main/java/com/nuvei/response/SettleTransactionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/SuspendUPOResponse.java b/src/main/java/com/nuvei/response/SuspendUPOResponse.java index 8ee4c7f..1e7d728 100644 --- a/src/main/java/com/nuvei/response/SuspendUPOResponse.java +++ b/src/main/java/com/nuvei/response/SuspendUPOResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/ThreeDResponse.java b/src/main/java/com/nuvei/response/ThreeDResponse.java index 8026c6c..818e1e9 100644 --- a/src/main/java/com/nuvei/response/ThreeDResponse.java +++ b/src/main/java/com/nuvei/response/ThreeDResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/UpdateOrderResponse.java b/src/main/java/com/nuvei/response/UpdateOrderResponse.java index 21009f4..04a59bc 100644 --- a/src/main/java/com/nuvei/response/UpdateOrderResponse.java +++ b/src/main/java/com/nuvei/response/UpdateOrderResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/UserResponse.java b/src/main/java/com/nuvei/response/UserResponse.java index 7a272be..4d7072c 100644 --- a/src/main/java/com/nuvei/response/UserResponse.java +++ b/src/main/java/com/nuvei/response/UserResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/Verify3dResponse.java b/src/main/java/com/nuvei/response/Verify3dResponse.java index fd9a2d3..a1f9cbe 100644 --- a/src/main/java/com/nuvei/response/Verify3dResponse.java +++ b/src/main/java/com/nuvei/response/Verify3dResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/response/VoidTransactionResponse.java b/src/main/java/com/nuvei/response/VoidTransactionResponse.java index e1edbde..ba125ad 100644 --- a/src/main/java/com/nuvei/response/VoidTransactionResponse.java +++ b/src/main/java/com/nuvei/response/VoidTransactionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.response; diff --git a/src/main/java/com/nuvei/util/APIConstants.java b/src/main/java/com/nuvei/util/APIConstants.java index cfae665..38ed911 100644 --- a/src/main/java/com/nuvei/util/APIConstants.java +++ b/src/main/java/com/nuvei/util/APIConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; @@ -109,7 +109,6 @@ public String getUrl() { // field limitations using regular expressions: - String IP_ADDRESS_REGEX = "^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"; String EXP_YEAR_REGEX = "^$|(?:(20)\\d{2}|\\d{2})$"; // two or four digits String EXP_MONTH_REGEX = "^$|(0?[1-9]|1[012])$"; String DATE_OF_BIRTH_REGEX = "^\\d{4}\\-(0?[1-9]|1[012])\\-(0?[1-9]|[12][0-9]|3[01])$"; diff --git a/src/main/java/com/nuvei/util/AddressUtils.java b/src/main/java/com/nuvei/util/AddressUtils.java index 2e8d5ab..033156c 100644 --- a/src/main/java/com/nuvei/util/AddressUtils.java +++ b/src/main/java/com/nuvei/util/AddressUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/CardUtils.java b/src/main/java/com/nuvei/util/CardUtils.java index ae9eee3..ca2a233 100644 --- a/src/main/java/com/nuvei/util/CardUtils.java +++ b/src/main/java/com/nuvei/util/CardUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/ChecksumUtils.java b/src/main/java/com/nuvei/util/ChecksumUtils.java index fb607c4..7bd78cd 100644 --- a/src/main/java/com/nuvei/util/ChecksumUtils.java +++ b/src/main/java/com/nuvei/util/ChecksumUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; @@ -23,7 +23,7 @@ /** *

    * Utility class used for calculating the Nuvei's request's checksum. Merchant key can be obtained by contacting - * Nuvei’s Integration Team + * Nuvei's Integration Team * * @author Nikola Dichev * @since 3/21/2017 diff --git a/src/main/java/com/nuvei/util/Constants.java b/src/main/java/com/nuvei/util/Constants.java index 3eff020..79e6175 100644 --- a/src/main/java/com/nuvei/util/Constants.java +++ b/src/main/java/com/nuvei/util/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/DeviceUtils.java b/src/main/java/com/nuvei/util/DeviceUtils.java index 2e583cc..19204d7 100644 --- a/src/main/java/com/nuvei/util/DeviceUtils.java +++ b/src/main/java/com/nuvei/util/DeviceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java b/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java index 9869142..b1d93aa 100644 --- a/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java +++ b/src/main/java/com/nuvei/util/DynamicDescriptorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/MerchantUtils.java b/src/main/java/com/nuvei/util/MerchantUtils.java index c52ca88..ecc28c8 100644 --- a/src/main/java/com/nuvei/util/MerchantUtils.java +++ b/src/main/java/com/nuvei/util/MerchantUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/RequestUtils.java b/src/main/java/com/nuvei/util/RequestUtils.java index 424281f..94838f4 100644 --- a/src/main/java/com/nuvei/util/RequestUtils.java +++ b/src/main/java/com/nuvei/util/RequestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; @@ -11,7 +11,7 @@ /** *

    - * Utility class with helper methods for calculating some of the params needed when creating a request to Nuvei + * Utility class with helper methods for calculating some of the params needed when creating a request 2007 - 2024 Nuvei Corporation * * @author Nikola Dichev * @since 2/17/2017 diff --git a/src/main/java/com/nuvei/util/UrlUtils.java b/src/main/java/com/nuvei/util/UrlUtils.java index 8baf502..de4daaf 100644 --- a/src/main/java/com/nuvei/util/UrlUtils.java +++ b/src/main/java/com/nuvei/util/UrlUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/ValidChecksum.java b/src/main/java/com/nuvei/util/ValidChecksum.java index f03a2c1..c4140ed 100644 --- a/src/main/java/com/nuvei/util/ValidChecksum.java +++ b/src/main/java/com/nuvei/util/ValidChecksum.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; diff --git a/src/main/java/com/nuvei/util/ValidationUtils.java b/src/main/java/com/nuvei/util/ValidationUtils.java index c6f5213..8710b3b 100644 --- a/src/main/java/com/nuvei/util/ValidationUtils.java +++ b/src/main/java/com/nuvei/util/ValidationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.util; @@ -19,7 +19,7 @@ /** *

    - * Utility class for validating the request to Nuvei + * Utility class for validating the request 2007 - 2024 Nuvei Corporation * * @author Nikola Dichev * @since 2/24/2017 diff --git a/src/test/java/com/nuvei/biz/NuveiTest.java b/src/test/java/com/nuvei/biz/NuveiTest.java index 1f62617..dce3382 100644 --- a/src/test/java/com/nuvei/biz/NuveiTest.java +++ b/src/test/java/com/nuvei/biz/NuveiTest.java @@ -1,5 +1,7 @@ + + /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.biz; @@ -10,6 +12,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -48,13 +51,16 @@ import com.nuvei.response.VoidTransactionResponse; import com.nuvei.util.Constants; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; + public class NuveiTest { @Mock @@ -109,10 +115,12 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws NuveiException when(executor.execute(any(PaymentRequest.class))).thenReturn(paymentResponse); sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); - PaymentResponse response = sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, - null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null); + PaymentResponse response = sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, + null, "BGN", "11", null, null, null, null, null, null, + null, null, null, null, null, null,null, null, + null, null, null, null, null, null, null,null, + null, null, null, null, null, null, null, + null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(PaymentRequest.class)); @@ -127,10 +135,13 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque exception.expect(NuveiConfigurationException.class); exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); - sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, - null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null); + sut.payment("userTokenId", "clientUniqueId", "clientRequestId", null, + null, "BGN", "11", null, null, null, null, + null, null, null, null, null, null, + null, null, null, null, null, null, + null, null, null, null, null, null, + null, null, null, null, null, null, + null, null, null, null, null); } @Test @@ -145,7 +156,7 @@ public void shouldExecuteInitPaymentRequestAndReturnResponse() throws NuveiExcep sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); InitPaymentResponse response = sut.initPayment("userTokenId", "clientUniqueId", "clientRequestId", "BGN", "11", - null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(InitPaymentRequest.class)); @@ -161,7 +172,7 @@ public void shouldThrowExceptionWhenInitPaymentRequestIsExecutedWithoutInitializ exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.initPayment("userTokenId", "clientUniqueId", "clientRequestId", "BGN", "11", - null, null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null, null); } @Test @@ -178,7 +189,7 @@ public void shouldExecuteOpenOrderRequestAndReturnResponse() throws NuveiExcepti OpenOrderResponse response = sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null); + null, null, null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(OpenOrderRequest.class)); @@ -196,7 +207,7 @@ public void shouldThrowExceptionWhenOpenOrderRequestIsExecutedWithoutInitializeR sut.openOrder("userTokenId", "clientRequestId", "clientUniqueId", null, null, null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null); } @Test @@ -358,7 +369,7 @@ public void shouldExecuteVerify3dRequestAndReturnResponse() throws NuveiExceptio sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); Verify3dResponse response = sut.verify3d("clientUniqueId", "clienRequestId", "11", "BGN", null, null, null, null, - "relatedTransaction", null, null, null, null); + "relatedTransaction", null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(Verify3dRequest.class)); @@ -374,7 +385,7 @@ public void shouldThrowExceptionWhenVerify3dRequestIsExecutedWithoutInitializeRe exception.expectMessage("Missing mandatory info for execution of payments! Please run initialization method before creating payments."); sut.verify3d("clientUniqueId", "clienRequestId", "11", "BGN", null, null, null, null, - "relatedTransaction", null, null, null, null); + "relatedTransaction", null, null, null, null, null); } @Test @@ -391,7 +402,7 @@ public void shouldExecuteAuthorize3dRequestAndReturnResponse() throws NuveiExcep Authorize3dResponse response = sut.authorize3d("usertTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, "relatedTransaction", null, null, null, null, null, null, - null); + null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(Authorize3dRequest.class)); @@ -409,7 +420,7 @@ public void shouldThrowExceptionWhenAuthorize3dRequestIsExecutedWithouthInitiali sut.authorize3d("usertTokenId", "clientUniqueId", "clientRequestId", null, null, "BGN", "11", null, null, null, null, null, null, null, null, null, null, null, null, null, "relatedTransaction", null, null, null, null, null, - null, null); + null, null, null); } @Test diff --git a/src/test/java/com/nuvei/test/BaseTest.java b/src/test/java/com/nuvei/test/BaseTest.java index 1defe90..3cf833d 100644 --- a/src/test/java/com/nuvei/test/BaseTest.java +++ b/src/test/java/com/nuvei/test/BaseTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test; diff --git a/src/test/java/com/nuvei/test/ValidationsTest.java b/src/test/java/com/nuvei/test/ValidationsTest.java index 52f048e..9b96d8e 100644 --- a/src/test/java/com/nuvei/test/ValidationsTest.java +++ b/src/test/java/com/nuvei/test/ValidationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test; @@ -13,6 +13,7 @@ import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; +import com.nuvei.request.*; import org.junit.Before; import org.junit.Test; @@ -27,40 +28,7 @@ import com.nuvei.model.SubMethodDetails; import com.nuvei.model.UrlDetails; import com.nuvei.model.UserAddress; -import com.nuvei.request.AccountCaptureRequest; -import com.nuvei.request.AddUPOAPMRequest; -import com.nuvei.request.AddUPOCreditCardByTempTokenRequest; -import com.nuvei.request.AddUPOCreditCardByTokenRequest; -import com.nuvei.request.AddUPOCreditCardRequest; -import com.nuvei.request.Authorization3DRequest; -import com.nuvei.request.CancelSubscriptionRequest; -import com.nuvei.request.CardDetailsRequest; -import com.nuvei.request.CardTokenizationRequest; -import com.nuvei.request.CreateSubscriptionRequest; -import com.nuvei.request.DccDetailsRequest; -import com.nuvei.request.DeleteUPORequest; -import com.nuvei.request.EditUPOAPMRequest; -import com.nuvei.request.EditUPOCreditCardRequest; -import com.nuvei.request.EnableUPORequest; -import com.nuvei.request.GetMerchantPaymentMethodsRequest; -import com.nuvei.request.GetOrderDetailsRequest; -import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.GetSubscriptionPlansRequest; -import com.nuvei.request.GetSubscriptionsListRequest; -import com.nuvei.request.GetUserUPOsRequest; -import com.nuvei.request.McpRatesRequest; -import com.nuvei.request.OpenOrderRequest; -import com.nuvei.request.Payment3DRequest; -import com.nuvei.request.PaymentAPMRequest; -import com.nuvei.request.PaymentCCRequest; -import com.nuvei.request.PayoutRequest; -import com.nuvei.request.RefundTransactionRequest; import com.nuvei.request.NuveiBaseRequest; -import com.nuvei.request.SettleTransactionRequest; -import com.nuvei.request.SuspendUPORequest; -import com.nuvei.request.UpdateOrderRequest; -import com.nuvei.request.Verify3dRequest; -import com.nuvei.request.VoidTransactionRequest; import com.nuvei.request.basic.EditUPOBasicRequest; import com.nuvei.util.AddressUtils; import com.nuvei.util.Constants; diff --git a/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java b/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java index 96b0ff9..f3995c3 100644 --- a/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow; @@ -8,6 +8,8 @@ import java.util.HashMap; import java.util.Map; +import com.nuvei.request.*; +import com.nuvei.response.NuveiResponse; import org.junit.Assert; import org.junit.Before; import org.junit.FixMethodOrder; @@ -15,14 +17,8 @@ import org.junit.runners.MethodSorters; import com.nuvei.model.MerchantInfo; -import com.nuvei.request.GetOrderDetailsRequest; -import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.OpenOrderRequest; -import com.nuvei.request.PaymentAPMRequest; import com.nuvei.request.NuveiBaseRequest; -import com.nuvei.request.UpdateOrderRequest; import com.nuvei.response.OpenOrderResponse; -import com.nuvei.response.NuveiResponse; import com.nuvei.response.UpdateOrderResponse; import com.nuvei.test.BaseTest; import com.nuvei.util.Constants; @@ -53,7 +49,7 @@ public void test1_getSessionTokenTest() throws IOException { NuveiBaseRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); + NuveiResponse response = (NuveiResponse) nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -118,7 +114,7 @@ public void test4_getOrderDetails() { .addOrderId(orderId) .addSessionToken(sessionToken) .build(); - NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); + NuveiResponse response = (NuveiResponse) nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); diff --git a/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java b/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java index 29a506c..0a6359f 100644 --- a/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java +++ b/src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow; diff --git a/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java b/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java index 2e3b75b..2681a7a 100644 --- a/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow; @@ -8,6 +8,8 @@ import java.util.HashMap; import java.util.Map; +import com.nuvei.request.*; +import com.nuvei.response.NuveiResponse; import org.junit.Assert; import org.junit.Before; import org.junit.FixMethodOrder; @@ -15,15 +17,9 @@ import org.junit.runners.MethodSorters; import com.nuvei.model.MerchantInfo; -import com.nuvei.request.GetOrderDetailsRequest; -import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.OpenOrderRequest; -import com.nuvei.request.PaymentCCRequest; import com.nuvei.request.NuveiBaseRequest; -import com.nuvei.request.UpdateOrderRequest; import com.nuvei.response.OpenOrderResponse; import com.nuvei.response.PaymentCCResponse; -import com.nuvei.response.NuveiResponse; import com.nuvei.response.UpdateOrderResponse; import com.nuvei.test.BaseTest; import com.nuvei.util.Constants; @@ -55,7 +51,7 @@ public void test1_getSessionTokenTest() throws IOException { NuveiBaseRequest nuveiRequest = GetSessionTokenRequest.builder() .addMerchantInfo(merchantInfo) .build(); - NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); + NuveiResponse response = (NuveiResponse) nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); @@ -119,7 +115,7 @@ public void test4_getOrderDetails() { .addOrderId(orderId) .addSessionToken(sessionToken) .build(); - NuveiResponse response = (NuveiResponse)nuveiRequestExecutor.executeRequest(nuveiRequest); + NuveiResponse response = (NuveiResponse) nuveiRequestExecutor.executeRequest(nuveiRequest); Assert.assertTrue(response != null); Assert.assertTrue(Constants.APIResponseStatus.SUCCESS.equals(response.getStatus())); diff --git a/src/test/java/com/nuvei/test/workflow/TestVariables.java b/src/test/java/com/nuvei/test/workflow/TestVariables.java index c284277..d017657 100644 --- a/src/test/java/com/nuvei/test/workflow/TestVariables.java +++ b/src/test/java/com/nuvei/test/workflow/TestVariables.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow; diff --git a/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java b/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java index e458887..95e62b7 100644 --- a/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java +++ b/src/test/java/com/nuvei/test/workflow/paymentCC/BasePaymentCCTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow.paymentCC; @@ -10,6 +10,8 @@ import javax.validation.Validation; import javax.validation.Validator; +import com.nuvei.biz.NuveiRequestExecutor; +import com.nuvei.request.NuveiBaseRequest; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -17,10 +19,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.nuvei.biz.NuveiRequestExecutor; import com.nuvei.model.MerchantInfo; import com.nuvei.request.GetSessionTokenRequest; -import com.nuvei.request.NuveiBaseRequest; import com.nuvei.response.GetSessionTokenResponse; import com.nuvei.util.Constants; diff --git a/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java b/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java index 05862cf..b16aebd 100644 --- a/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java +++ b/src/test/java/com/nuvei/test/workflow/paymentCC/InvalidPaymentCCRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2024 Nuvei International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ package com.nuvei.test.workflow.paymentCC; diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml index e7d6a9f..eec21f8 100644 --- a/src/test/resources/log4j2.xml +++ b/src/test/resources/log4j2.xml @@ -1,6 +1,6 @@ From dc1dc235e5a59bf5a6dd57098f44b22e73b41a29 Mon Sep 17 00:00:00 2001 From: Yoanna Evgenieva Date: Wed, 16 Apr 2025 15:46:00 +0300 Subject: [PATCH 46/55] Update POM --- pom-internal.xml | 0 pom.xml | 92 ++---------------------------------------------- 2 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 pom-internal.xml diff --git a/pom-internal.xml b/pom-internal.xml deleted file mode 100644 index e69de29..0000000 diff --git a/pom.xml b/pom.xml index c7f0345..0b9fc8a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,17 +8,13 @@ nuvei-sdk-java 2.0.0 - - https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt - - Nuvei SDK for Java - Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei's REST API is a simple, + Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through Nuvei's payment gateway. The API supports merchants of all levels of PCI certification, from their online and mobile merchant applications, and is compatible with a large variety of payment options, i.e. payment cards, alternative payment methods, etc. - https://github.com/NuveiInternational/nuvei-java + https://github.com/Nuvei/nuvei-java Nuvei @@ -32,29 +28,6 @@ - - scm:git:git://github.com/Nuvei/nuvei-server-java.git - scm:git:ssh://github.com:Nuvei/nuvei-server-java.git - http://github.com/Nuvei/nuvei-server-java/tree/master - - - - org.sonatype.oss - oss-parent - 9 - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - java8-doclint-disabled @@ -67,27 +40,6 @@ - - - safecharge-libs - Safecharge libraries - ${safecharge_artifactory} - - - safecharge-snapshot - Safecharge snapshot - ${safecharge_artifactory} - - - - - - safecharge-maven-plugins - Safecharge maven plugins - ${safecharge_artifactory} - - - @@ -98,28 +50,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - ${gpg.keyname} - ${gpg.keyname} - - --pinentry-mode - loopback - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -158,24 +88,6 @@ - - org.sonatype.plugins - 1.6.7 - nexus-staging-maven-plugin - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - - org.apache.maven.plugins maven-jar-plugin From 32e3a7329e96c020562bac356685671ba5a1781e Mon Sep 17 00:00:00 2001 From: Mikaela Zhekova Date: Mon, 19 May 2025 10:50:47 +0300 Subject: [PATCH 47/55] #1026373 - userTokenId lenght modified --- .../com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java index d4806c3..be67cc9 100644 --- a/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java +++ b/src/main/java/com/nuvei/request/AddUPOCreditCardByTempTokenRequest.java @@ -39,7 +39,7 @@ public class AddUPOCreditCardByTempTokenRequest * The unique identifier generated for each customer. */ @NotNull(message = "userTokenId parameter is mandatory!") - @Size(min = 1, max = 45) + @Size(min = 1, max = 255) private String userTokenId; /** From a5112c1ec4530d1c2f954f6b2de96dc55a87fc3e Mon Sep 17 00:00:00 2001 From: Yoanna Evgenieva Date: Thu, 20 Nov 2025 13:26:54 +0200 Subject: [PATCH 48/55] #1139189 Add conversion affiliate CountryCode --- src/main/java/com/nuvei/biz/Nuvei.java | 24 ++++++++++++------- .../java/com/nuvei/biz/RequestBuilder.java | 15 ++++++++---- .../request/NuveiTransactionRequest.java | 11 +++++++++ .../com/nuvei/request/PaymentRequest.java | 20 +++++++++++++++- .../java/com/nuvei/request/PayoutRequest.java | 18 ++++++++++++++ .../builder/NuveiTransactionBuilder.java | 8 +++++++ src/test/java/com/nuvei/biz/NuveiTest.java | 14 +++++------ 7 files changed, 90 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/nuvei/biz/Nuvei.java b/src/main/java/com/nuvei/biz/Nuvei.java index 3f4fef9..1c47dc9 100644 --- a/src/main/java/com/nuvei/biz/Nuvei.java +++ b/src/main/java/com/nuvei/biz/Nuvei.java @@ -122,6 +122,7 @@ private String getSessionToken() throws NuveiException { * @param cvvNotUsed Flag if CVV is not used * @param serviceDueDate Subscription end date * @param digitalAssetType Digital currency transaction identifier. + * @param conversionAffiliateCountryCode The country code used for conversion affiliate tracking. * @return Passes through the response from Nuvei's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand NuveiConfigurationException exception will be thrown. @@ -135,7 +136,7 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String String isMoto, SubMerchant subMerchant, String rebillingType, String authenticationOnlyType, String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed, String serviceDueDate, String digitalAssetType) throws NuveiException { + String cvvNotUsed, String serviceDueDate, String digitalAssetType, String conversionAffiliateCountryCode) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); @@ -143,7 +144,8 @@ public PaymentResponse payment(String userTokenId, String clientUniqueId, String isRebilling, currency, amount, amountDetails, items, deviceDetails, userDetails, shippingAddress, billingAddress, dynamicDescriptor, merchantDetails, addendums, urlDetails, customSiteName, productId, customData, relatedTransactionId, transactionType, autoPayment3D, isMoto, subMerchant, rebillingType, authenticationOnlyType, userId, externalSchemeDetails, currencyConversion, isPartialApproval, paymentFlow, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate, digitalAssetType); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate, digitalAssetType, + conversionAffiliateCountryCode); return (PaymentResponse) requestExecutor.execute(request); } @@ -313,6 +315,7 @@ public GetPaymentStatusResponse getPaymentStatus() throws NuveiException { * back-office tool transaction reporting and is returned in response. * @param comment Enables the addition of a free text comment to the request. * @param subMerchant Contains information about the SubMerchant. + * @param conversionAffiliateCountryCode The country code used for conversion affiliate tracking. * @return Passes through the response from Nuvei's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand NuveiConfigurationException exception will be thrown. @@ -320,12 +323,14 @@ public GetPaymentStatusResponse getPaymentStatus() throws NuveiException { */ public VoidTransactionResponse voidTransaction(String clientRequestId, String relatedTransactionId, String amount, String currency, String authCode, String clientUniqueId, UrlDetails urlDetails, String customSiteName, - String productId, String customData, String comment, SubMerchant subMerchant) throws NuveiException { + String productId, String customData, String comment, SubMerchant subMerchant, + String conversionAffiliateCountryCode) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); NuveiBaseRequest request = requestBuilder.getVoidTransactionRequest(sessionToken, clientRequestId, merchantInfo, relatedTransactionId, - amount, currency, authCode, clientUniqueId, urlDetails, customSiteName, productId, customData, comment, subMerchant); + amount, currency, authCode, clientUniqueId, urlDetails, customSiteName, productId, customData, comment, subMerchant, + conversionAffiliateCountryCode); return (VoidTransactionResponse) requestExecutor.execute(request); } @@ -401,6 +406,7 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String * of all item names up until parameter maximum length. * @param relatedTransactionId The ID of the settle transaction. * @param subMerchant Contains information about the SubMerchant. + * @param conversionAffiliateCountryCode The country code used for conversion affiliate tracking. * @return Passes through the response from Nuvei's REST API. * @throws NuveiConfigurationException If the {@link Nuvei#initialize(String, String, String, String, Constants.HashAlgorithm)} * method is not invoked beforehand NuveiConfigurationException exception will be thrown. @@ -409,13 +415,14 @@ public SettleTransactionResponse settleTransaction(String clientUniqueId, String public RefundTransactionResponse refundTransaction(String clientUniqueId, String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) throws NuveiException { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId, + String conversionAffiliateCountryCode) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); NuveiBaseRequest request = requestBuilder.getRefundTransactionRequest(sessionToken, merchantInfo, clientUniqueId, clientRequestId, urlDetails, amount, authCode, comment, currency, customData, customSiteName, productId, - relatedTransactionId, subMerchant, companyDetails, refundPaymentOption, userTokenId); + relatedTransactionId, subMerchant, companyDetails, refundPaymentOption, userTokenId, conversionAffiliateCountryCode); return (RefundTransactionResponse) requestExecutor.execute(request); } @@ -668,6 +675,7 @@ public AccountCaptureResponse accountCapture(String clientRequestId, String user * @param deviceDetails Information about client device * @param currencyConversion Holds information about currency conversion type (DCC / MCP) and amount. * @param digitalAssetType Digital currency transaction identifier. + * @param conversionAffiliateCountryCode Country code used for conversion affiliate tracking. * @return Passes through the response from Nuvei's REST API. * @throws NuveiException */ @@ -675,7 +683,7 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, - CurrencyConversion currencyConversion, String digitalAssetType) + CurrencyConversion currencyConversion, String digitalAssetType, String conversionAffiliateCountryCode) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); @@ -684,7 +692,7 @@ public PayoutResponse payout(String userTokenId, String clientUniqueId, String c PayoutRequest request = requestBuilder.getPayoutRequest(sessionToken, merchantInfo, userTokenId, clientUniqueId, clientRequestId, amount, currency,userPaymentOption, comment, dynamicDescriptor, merchantDetails, urlDetails, subMethodDetails, cardData, deviceDetails, userDetails, companyDetails, - currencyConversion, digitalAssetType); + currencyConversion, digitalAssetType, conversionAffiliateCountryCode); return (PayoutResponse) requestExecutor.execute(request); } diff --git a/src/main/java/com/nuvei/biz/RequestBuilder.java b/src/main/java/com/nuvei/biz/RequestBuilder.java index 10ea247..646cea3 100644 --- a/src/main/java/com/nuvei/biz/RequestBuilder.java +++ b/src/main/java/com/nuvei/biz/RequestBuilder.java @@ -30,7 +30,8 @@ public NuveiBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sess String userId, ExternalSchemeDetails externalSchemeDetails, CurrencyConversion currencyConversion, String isPartialApproval, String paymentFlow, String redirectFlowUITheme, String aftOverride, RecipientDetails recipientDetails, CompanyDetails companyDetails, ShippingTrackingDetails shippingTrackingDetails, - String cvvNotUsed, String serviceDueDate, String digitalAssetType) { + String cvvNotUsed, String serviceDueDate, String digitalAssetType, String conversionAffiliateCountryCode +) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -74,6 +75,7 @@ public NuveiBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String sess .addCvvNotUsed(cvvNotUsed) .addServiceDueDate(serviceDueDate) .addDigitalAssetType(digitalAssetType) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } @@ -172,7 +174,8 @@ public NuveiBaseRequest getPayoutStatusRequest(String sessionToken, MerchantInfo public NuveiBaseRequest getVoidTransactionRequest(String sessionToken, String clientRequestId, MerchantInfo merchantInfo, String relatedTransactionId, String amount, String currency, String authCode, String clientUniqueId, UrlDetails urlDetails, String customSiteName, - String productId, String customData, String comment, SubMerchant subMerchant) { + String productId, String customData, String comment, SubMerchant subMerchant, + String conversionAffiliateCountryCode) { return VoidTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -188,6 +191,7 @@ public NuveiBaseRequest getVoidTransactionRequest(String sessionToken, String cl .addClientRequestId(clientRequestId) .addAuthCode(authCode) .addSubMerchant(subMerchant) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } @@ -223,7 +227,8 @@ public NuveiBaseRequest getRefundTransactionRequest(String sessionToken, Merchan String clientRequestId, UrlDetails urlDetails, String amount, String authCode, String comment, String currency, String customData, String customSiteName, String productId, String relatedTransactionId, SubMerchant subMerchant, - CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId) { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId, + String conversionAffiliateCountryCode ) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -242,6 +247,7 @@ public NuveiBaseRequest getRefundTransactionRequest(String sessionToken, Merchan .addCompanyDetails(companyDetails) .addRefundPaymentOption(refundPaymentOption) .addUserTokenId(userTokenId) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } @@ -379,7 +385,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant UserPaymentOption userPaymentOption, String comment, DynamicDescriptor dynamicDescriptor, MerchantDetails merchantDetails, UrlDetails urlDetails, SubMethodDetails subMethodDetails, CardData cardData, DeviceDetails deviceDetails, UserDetails userDetails, CompanyDetails companyDetails, - CurrencyConversion currencyConversion, String digitalAssetType) { + CurrencyConversion currencyConversion, String digitalAssetType, String conversionAffiliateCountryCode) { return PayoutRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -399,6 +405,7 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .addCompanyDetails(companyDetails) .addCurrencyConversion(currencyConversion) .addDigitalAssetType(digitalAssetType) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } diff --git a/src/main/java/com/nuvei/request/NuveiTransactionRequest.java b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java index 36dbbea..fb5502c 100644 --- a/src/main/java/com/nuvei/request/NuveiTransactionRequest.java +++ b/src/main/java/com/nuvei/request/NuveiTransactionRequest.java @@ -75,6 +75,8 @@ public abstract class NuveiTransactionRequest extends NuveiRequest { private ShippingTrackingDetails shippingTrackingDetails; + private String conversionAffiliateCountryCode; + public String getAmount() { return amount; } @@ -175,6 +177,14 @@ public void setShippingTrackingDetails(ShippingTrackingDetails shippingTrackingD this.shippingTrackingDetails = shippingTrackingDetails; } + public String getConversionAffiliateCountryCode() { + return conversionAffiliateCountryCode; + } + + public void setConversionAffiliateCountryCode(String conversionAffiliateCountryCode) { + this.conversionAffiliateCountryCode = conversionAffiliateCountryCode; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("NuveiTransactionRequest{"); @@ -190,6 +200,7 @@ public String toString() { sb.append(", subMerchant='").append(subMerchant).append('\''); sb.append(", companyDetails='").append(companyDetails).append('\''); sb.append(", shippingTrackingDetails='").append(shippingTrackingDetails).append('\''); + sb.append(", conversionAffiliateCountryCode='").append(conversionAffiliateCountryCode).append('\''); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/nuvei/request/PaymentRequest.java b/src/main/java/com/nuvei/request/PaymentRequest.java index 404958c..0c14dcf 100644 --- a/src/main/java/com/nuvei/request/PaymentRequest.java +++ b/src/main/java/com/nuvei/request/PaymentRequest.java @@ -24,6 +24,8 @@ public class PaymentRequest extends Authorize3dAndPaymentRequest { private String serviceDueDate; + private String conversionAffiliateCountryCode; + public String getIsMoto() { return isMoto; } @@ -44,6 +46,14 @@ public void setCvvNotUsed(String cvvNotUsed) { public void setServiceDueDate(String serviceDueDate) { this.serviceDueDate = serviceDueDate; } + public String getConversionAffiliateCountryCode() { + return conversionAffiliateCountryCode; + } + + public void setConversionAffiliateCountryCode(String conversionAffiliateCountryCode) { + this.conversionAffiliateCountryCode = conversionAffiliateCountryCode; + } + public static Builder builder() { return new Builder(); } @@ -56,7 +66,8 @@ public String toString() { .append(", isMoto=").append(getIsMoto()) .append(", autoPayment3D=").append(isAutoPayment3D()) .append(", cvvNotUsed=").append(cvvNotUsed) - .append(", serviceDueDate=").append(getServiceDueDate()); + .append(", serviceDueDate=").append(getServiceDueDate()) + .append(", conversionAffiliateCountryCode=").append(getConversionAffiliateCountryCode()); sb.append(super.toString()); sb.append('}'); @@ -68,6 +79,7 @@ public static class Builder extends Authorize3dAndPaymentRequest.Builder Date: Thu, 27 Nov 2025 11:57:36 +0000 Subject: [PATCH 49/55] Merged PR 123149: #1003530 remove unused file (brought with revert) #1003530 remove unused file (brought with revert) Related work items: #1003530 --- pom-internal.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pom-internal.xml diff --git a/pom-internal.xml b/pom-internal.xml deleted file mode 100644 index e69de29..0000000 From abf966382e6f1afa7b5c0fe61e5e0fa3c1393108 Mon Sep 17 00:00:00 2001 From: Yoanna Evgenieva Date: Fri, 28 Nov 2025 12:42:54 +0200 Subject: [PATCH 50/55] #1151100 Add ancillary services field to airline addendum --- src/main/java/com/nuvei/model/AddendumsAirlines.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/nuvei/model/AddendumsAirlines.java b/src/main/java/com/nuvei/model/AddendumsAirlines.java index e3ff503..dd90ba9 100644 --- a/src/main/java/com/nuvei/model/AddendumsAirlines.java +++ b/src/main/java/com/nuvei/model/AddendumsAirlines.java @@ -19,6 +19,8 @@ public class AddendumsAirlines { @Valid private AddendumsAirlinesReservationDetails reservationDetails; + private String ancillaryServicesInfo; + public AddendumsAirlinesReservationDetails getReservationDetails() { return reservationDetails; } @@ -26,4 +28,12 @@ public AddendumsAirlinesReservationDetails getReservationDetails() { public void setReservationDetails(AddendumsAirlinesReservationDetails reservationDetails) { this.reservationDetails = reservationDetails; } + + public String getAncillaryServicesInfo() { + return ancillaryServicesInfo; + } + + public void setAncillaryServicesInfo(String ancillaryServicesInfo) { + this.ancillaryServicesInfo = ancillaryServicesInfo; + } } From 0fa3de8c72460fb76f8802dea4d8e3e120417a1e Mon Sep 17 00:00:00 2001 From: Dilyan Angelov Date: Thu, 4 Dec 2025 09:17:09 +0000 Subject: [PATCH 51/55] Update build-sdk.yaml for Azure Pipelines --- build-sdk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-sdk.yaml b/build-sdk.yaml index d261af3..273d6ea 100644 --- a/build-sdk.yaml +++ b/build-sdk.yaml @@ -14,4 +14,4 @@ schedules: always: false extends: - template: pipelines/restapi1.0-java-sdk.yaml@DevOpsTemplates \ No newline at end of file + template: pipelines/restapi1.0-java-sdk2.0.yaml@DevOpsTemplates \ No newline at end of file From e36f416e86c3f51c7a38c3433719b2ca981fb299 Mon Sep 17 00:00:00 2001 From: Ricardas Faturovas Date: Thu, 4 Dec 2025 13:40:08 +0000 Subject: [PATCH 52/55] Merged PR 158250: #1155022 Change old nexus-staging plugin to maven-central Because of OSSRH [deprecation](https://central.sonatype.org/news/20250326_ossrh_sunset/) we need to update the way we publish this to maven. Changes were done according to https://central.sonatype.org/publish/publish-portal-maven/ Also according to the docs [snapshot](https://central.sonatype.org/publish/publish-portal-snapshots/#publishing-with-the-central-publishing-maven-plugin) section, we shouldn't need explicit distribution management configuration Related work items: #1155022 --- pom.xml | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index c7f0345..c3bf49b 100644 --- a/pom.xml +++ b/pom.xml @@ -38,23 +38,6 @@ http://github.com/Nuvei/nuvei-server-java/tree/master - - org.sonatype.oss - oss-parent - 9 - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - java8-doclint-disabled @@ -159,21 +142,12 @@ - org.sonatype.plugins - 1.6.7 - nexus-staging-maven-plugin - - - default-deploy - deploy - - deploy - - - + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true - ossrh - https://oss.sonatype.org/ + central From 9feb3c91bf52631eaca235dfe990533a36bacb38 Mon Sep 17 00:00:00 2001 From: Ricardas Faturovas Date: Thu, 4 Dec 2025 14:04:13 +0000 Subject: [PATCH 53/55] Merged PR 158310: #1155022 Add developers tag Add developers tag Related work items: #1155022 --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index c3bf49b..68b519d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,15 @@ + + + Dilyan Angelov + Dilyan.Angelov@nuvei.com + Nuvei + https://www.nuvei.com/ + + + scm:git:git://github.com/Nuvei/nuvei-server-java.git scm:git:ssh://github.com:Nuvei/nuvei-server-java.git From 27712f718be22189a96cef0963a33bb08a0e2de2 Mon Sep 17 00:00:00 2001 From: Ricardas Faturovas Date: Fri, 5 Dec 2025 12:36:01 +0000 Subject: [PATCH 54/55] Merged PR 158460: #1155022 Add auto publish Add auto publish option. Related work items: #1155022 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 68b519d..7504617 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,7 @@ true central + true From 0c602f25e8c493e02d554513badcdf3db3b14d43 Mon Sep 17 00:00:00 2001 From: "bozhidar.banchev" Date: Fri, 5 Dec 2025 15:43:15 +0200 Subject: [PATCH 55/55] Update to version 2.0.1 --- README.md | 4 ++-- pom-github.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1166a30..e60d7b1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If your application is going to be deployed on a Java EE server add the followin com.nuvei.com nuvei-sdk-java - 2.0.0 + 2.0.1 ``` @@ -33,7 +33,7 @@ For example: com.nuvei.com nuvei-sdk-java - 2.0.0 + 2.0.1 org.apache.bval diff --git a/pom-github.xml b/pom-github.xml index 0b9fc8a..d32caee 100644 --- a/pom-github.xml +++ b/pom-github.xml @@ -6,7 +6,7 @@ com.nuvei nuvei-sdk-java - 2.0.0 + 2.0.1 Nuvei SDK for Java Nuvei’s REST API SDK for Java provides developer tools for accessing Nuvei's REST API. Nuvei’s REST API is a simple, diff --git a/pom.xml b/pom.xml index 116b2f7..0ccfde9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.nuvei nuvei-sdk-java - 2.0.0 + 2.0.1 https://srv-bsf-jfedge.gw-4u.com/artifactory/nvi-maven-vrt