diff --git a/LICENSE b/LICENSE index 8feb78b..e9ecc5e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Safecharge 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 cd422d0..e60d7b1 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,24 @@ -# 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/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/documentation/accept-payment/server-to-server/server-sdks/java-sdk/ -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 +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.safecharge - safecharge-sdk-java - 1.7.13 + + + com.nuvei.com + nuvei-sdk-java + 2.0.1 ``` @@ -26,12 +27,13 @@ If you are going to use the SDK in Java SE or a non Java EE server please add a For example: ```xml + ... - - com.safecharge - safecharge-sdk-java - 1.7.13 + + com.nuvei.com + nuvei-sdk-java + 2.0.1 org.apache.bval @@ -43,34 +45,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() - .addMerchantInfo(merchantInfo) - .build(); + 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/build-sdk.yaml b/build-sdk.yaml new file mode 100644 index 0000000..273d6ea --- /dev/null +++ b/build-sdk.yaml @@ -0,0 +1,17 @@ +trigger: none +resources: + repositories: + - repository: DevOpsTemplates + name: DigitalPayments/DevOps-Templates + type: git + ref: master +schedules: +- cron: "20 00 * * *" + displayName: "Daily Security analysis" + branches: + include: + - develop + always: false + +extends: + template: pipelines/restapi1.0-java-sdk2.0.yaml@DevOpsTemplates \ No newline at end of file diff --git a/pom-github.xml b/pom-github.xml new file mode 100644 index 0000000..d32caee --- /dev/null +++ b/pom-github.xml @@ -0,0 +1,203 @@ + + + 4.0.0 + + com.nuvei + nuvei-sdk-java + 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, + 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-java + + + Nuvei + https://www.nuvei.com + + + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + + + java8-doclint-disabled + + [1.8,) + + + none + + + + + + + + . + + VERSION + + + + + + 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.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 8b58c05..0ccfde9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +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.13 + com.nuvei + nuvei-sdk-java + 2.0.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, - easy to use, secure and stateless API, which enables online merchants and service providers to process consumer payments through SafeCharge’s + + 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, + 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 @@ -28,6 +32,21 @@ + + + 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 + http://github.com/Nuvei/nuvei-server-java/tree/master + + java8-doclint-disabled @@ -88,6 +107,16 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + true + + org.apache.maven.plugins maven-jar-plugin diff --git a/src/main/java/com/safecharge/biz/Safecharge.java b/src/main/java/com/nuvei/biz/Nuvei.java similarity index 82% rename from src/main/java/com/safecharge/biz/Safecharge.java rename to src/main/java/com/nuvei/biz/Nuvei.java index 49681e2..1c47dc9 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 Corporation. */ -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. @@ -122,10 +122,11 @@ private String getSessionToken() throws SafechargeException { * @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 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. + * @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. + * @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, @@ -135,28 +136,29 @@ 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 SafechargeException { + String cvvNotUsed, String serviceDueDate, String digitalAssetType, String conversionAffiliateCountryCode) 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, - redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate, digitalAssetType); + redirectFlowUITheme, aftOverride, recipientDetails, companyDetails, shippingTrackingDetails, cvvNotUsed, serviceDueDate, digitalAssetType, + conversionAffiliateCountryCode); return (PaymentResponse) requestExecutor.execute(request); } 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. @@ -172,22 +174,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, String relatedTransactionId) throws SafechargeException { + RecipientDetails recipientDetails, String relatedTransactionId) 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, relatedTransactionId); @@ -196,7 +198,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. @@ -225,7 +227,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 @@ -234,7 +236,7 @@ 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. @@ -243,9 +245,9 @@ public InitPaymentResponse initPayment(String userTokenId, String clientUniqueId * @param aftOverride Used to instruct the gateway that this transaction should not be marked as AFT. Accepted values: "0" / "1". * @param digitalAssetType Digital currency transaction identifier. * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} + * @throws NuveiConfigurationException If the {@link Nuvei#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. + * @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, @@ -256,11 +258,11 @@ public OpenOrderResponse openOrder(String userTokenId, String clientRequestId, S 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) throws SafechargeException { + String digitalAssetType) 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, @@ -272,27 +274,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. @@ -309,30 +311,33 @@ 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. + * @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. + * @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, + String conversionAffiliateCountryCode) throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); RequestBuilder requestBuilder = serviceFactory.getRequestBuilder(); - SafechargeBaseRequest request = requestBuilder.getVoidTransactionRequest(sessionToken, clientRequestId, merchantInfo, relatedTransactionId, - amount, currency, authCode, clientUniqueId, urlDetails, customSiteName, productId, customData, comment, subMerchant); + NuveiBaseRequest request = requestBuilder.getVoidTransactionRequest(sessionToken, clientRequestId, merchantInfo, relatedTransactionId, + amount, currency, authCode, clientUniqueId, urlDetails, customSiteName, productId, customData, comment, subMerchant, + conversionAffiliateCountryCode); return (VoidTransactionResponse) requestExecutor.execute(request); } /** *

- * 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 *

* @@ -348,7 +353,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. @@ -357,20 +362,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); @@ -379,7 +384,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. @@ -393,7 +398,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. @@ -401,30 +406,30 @@ 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. + * @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. + * @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, + String conversionAffiliateCountryCode) 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); + relatedTransactionId, subMerchant, companyDetails, refundPaymentOption, userTokenId, conversionAffiliateCountryCode); return (RefundTransactionResponse) requestExecutor.execute(request); } /** *

- * 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 @@ -435,31 +440,31 @@ 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. * @param digitalAssetType Digital currency transaction identifier. * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} + * @throws NuveiConfigurationException If the {@link Nuvei#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. + * @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, - String digitalAssetType) throws SafechargeException { + String digitalAssetType) 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, digitalAssetType); @@ -468,7 +473,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. *

@@ -502,22 +507,22 @@ 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 * @param digitalAssetType Digital currency transaction identifier. * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeConfigurationException If the {@link Safecharge#initialize(String, String, String, String, Constants.HashAlgorithm)} + * @throws NuveiConfigurationException If the {@link Nuvei#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. + * @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, @@ -527,11 +532,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, String digitalAssetType) throws SafechargeException { + String isPartialApproval, String digitalAssetType) 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, @@ -550,12 +555,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(); @@ -580,11 +585,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(); @@ -605,10 +610,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(); @@ -635,11 +640,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(); @@ -670,15 +675,16 @@ 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. - * @return Passes through the response from Safecharge's REST API. - * @throws SafechargeException + * @param conversionAffiliateCountryCode Country code used for conversion affiliate tracking. + * @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, String digitalAssetType) - throws SafechargeException { + CurrencyConversion currencyConversion, String digitalAssetType, String conversionAffiliateCountryCode) + throws NuveiException { ensureMerchantInfoAndSessionTokenNotNull(); @@ -686,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); } @@ -700,14 +706,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); @@ -716,14 +722,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); } @@ -737,14 +743,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..5784f2a 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 Corporation. */ -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..4ef0a8b 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 Corporation. */ -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 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 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..155d11f 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 Corporation. */ -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} 2007 - 2024 Nuvei Corporation'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} 2007 - 2024 Nuvei Corporation'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 85% rename from src/main/java/com/safecharge/biz/RequestBuilder.java rename to src/main/java/com/nuvei/biz/RequestBuilder.java index 398b1fa..646cea3 100644 --- a/src/main/java/com/safecharge/biz/RequestBuilder.java +++ b/src/main/java/com/nuvei/biz/RequestBuilder.java @@ -1,25 +1,25 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ -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, + 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, @@ -30,7 +30,8 @@ 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 serviceDueDate, String digitalAssetType) { + String cvvNotUsed, String serviceDueDate, String digitalAssetType, String conversionAffiliateCountryCode +) { return PaymentRequest.builder() .addSessionToken(sessionToken) .addIsRebilling(isRebilling) @@ -74,10 +75,11 @@ public SafechargeBaseRequest getPaymentRequest(MerchantInfo merchantInfo, String .addCvvNotUsed(cvvNotUsed) .addServiceDueDate(serviceDueDate) .addDigitalAssetType(digitalAssetType) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } - public SafechargeBaseRequest getInitPaymentRequest(String sessionToken, String userTokenId, String clientUniqueId, String clientRequestId, String currency, + 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 relatedTransactionId) { @@ -101,7 +103,7 @@ public SafechargeBaseRequest getInitPaymentRequest(String sessionToken, String u .build(); } - public SafechargeBaseRequest getOpenOrderRequest(MerchantInfo merchantInfo, String sessionToken, String clientRequestId, String customSiteName, + 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, @@ -154,14 +156,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) @@ -169,10 +171,11 @@ 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, + String conversionAffiliateCountryCode) { return VoidTransactionRequest.builder() .addMerchantInfo(merchantInfo) .addSessionToken(sessionToken) @@ -188,15 +191,16 @@ public SafechargeBaseRequest getVoidTransactionRequest(String sessionToken, Stri .addClientRequestId(clientRequestId) .addAuthCode(authCode) .addSubMerchant(subMerchant) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .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) @@ -219,11 +223,12 @@ public SafechargeBaseRequest getSettleTransactionRequest(String sessionToken, Me .build(); } - public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, + 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) { + CompanyDetails companyDetails, RefundPaymentOption refundPaymentOption, String userTokenId, + String conversionAffiliateCountryCode ) { return RefundTransactionRequest.builder() .addSessionToken(sessionToken) .addMerchantInfo(merchantInfo) @@ -242,10 +247,11 @@ public SafechargeBaseRequest getRefundTransactionRequest(String sessionToken, Me .addCompanyDetails(companyDetails) .addRefundPaymentOption(refundPaymentOption) .addUserTokenId(userTokenId) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .build(); } - public SafechargeBaseRequest getVerify3dRequest(String sessionToken, MerchantInfo merchantInfo, String clientUniqueId, String clientRequestId, + 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, @@ -270,7 +276,7 @@ public SafechargeBaseRequest getVerify3dRequest(String sessionToken, MerchantInf .build(); } - public SafechargeBaseRequest getAuthorize3dRequest(MerchantInfo merchantInfo, String sessionToken, String userTokenId, String clientUniqueId, + 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, @@ -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,10 +405,11 @@ public PayoutRequest getPayoutRequest(String sessionToken, MerchantInfo merchant .addCompanyDetails(companyDetails) .addCurrencyConversion(currencyConversion) .addDigitalAssetType(digitalAssetType) + .addConversionAffiliateCountryCode(conversionAffiliateCountryCode) .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) @@ -413,7 +420,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..1b53df2 --- /dev/null +++ b/src/main/java/com/nuvei/biz/ServiceFactory.java @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..939956f 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 Corporation. */ -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.NuveiBaseRequest; +import com.nuvei.request.PaymentAPMRequest; +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 2007 - 2024 Nuvei Corporation */ 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..60c7a29 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 Corporation. */ -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.NuveiBaseRequest; +import com.nuvei.request.PaymentCCRequest; +import com.nuvei.response.NuveiResponse; +import com.nuvei.response.PaymentsResponse; +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 2007 - 2024 Nuvei Corporation */ 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..2602488 --- /dev/null +++ b/src/main/java/com/nuvei/exception/NuveiConfigurationException.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..c170182 --- /dev/null +++ b/src/main/java/com/nuvei/exception/NuveiException.java @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..771d40b 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 Corporation. */ -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..4c7ab39 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 Corporation. */ -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..59a5ac6 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 Corporation. */ -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 57% rename from src/main/java/com/safecharge/model/AddendumsAirlines.java rename to src/main/java/com/nuvei/model/AddendumsAirlines.java index 3969d40..dd90ba9 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 Corporation. */ -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 */ @@ -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; + } } 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..d24c86a 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 Corporation. */ -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..83ef351 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 Corporation. */ -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..e94215f 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 Corporation. */ -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..24c34fc 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 Corporation. */ -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..ba7f9ea 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 Corporation. */ -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..ea1dc89 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 Corporation. */ -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..3f58dae 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 Corporation. */ -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..50a84fa 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 Corporation. */ -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..8873018 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 Corporation. */ -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..808aa26 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 Corporation. */ -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..77b5c1b 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 Corporation. */ -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..52e4aec 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 Corporation. */ -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..1c5e3cd 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 Corporation. */ -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..763d5ad 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 Corporation. */ -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..70e7db0 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 Corporation. */ -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..b290a34 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 Corporation. */ -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..a8a1af3 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 Corporation. */ -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..734485a 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 Corporation. */ -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 89% rename from src/main/java/com/safecharge/model/DeviceDetails.java rename to src/main/java/com/nuvei/model/DeviceDetails.java index 978806a..00b5c13 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 Corporation. */ -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..f9b017f 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 Corporation. */ -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..29b2bdd 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 Corporation. */ -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..88d9178 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 Corporation. */ -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..0c4590d 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 Corporation. */ -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..c0b9473 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 Corporation. */ -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..895c44a 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 Corporation. */ -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..362fc4e 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 Corporation. */ -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..6d08742 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 Corporation. */ -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..81b84a7 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 Corporation. */ -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..9cd6e46 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 Corporation. */ -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..bec0411 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 Corporation. */ -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..5b4c4ac 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 Corporation. */ -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..b17b253 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 Corporation. */ -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..6489299 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 Corporation. */ -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..d2b91b7 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 Corporation. */ -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..358a28c 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 Corporation. */ -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..13c1a8f 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 Corporation. */ -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..66d4f85 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 Corporation. */ -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..dd1e014 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 Corporation. */ -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..e3de955 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 Corporation. */ -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..63ba3f9 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 Corporation. */ -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..4a2ad7e 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 Corporation. */ -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..32a9b38 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 Corporation. */ -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..b7a0b43 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 Corporation. */ -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..d6a4f63 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 Corporation. */ -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..0b8f164 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 Corporation. */ -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..7b23f92 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 Corporation. */ -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..c5b9822 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 Corporation. */ -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..13dd122 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 Corporation. */ -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..059c01f 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 Corporation. */ -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..dcb34c1 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 Corporation. */ -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..8c924db 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 Corporation. */ -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..f200712 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 Corporation. */ -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..28a4a31 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 Corporation. */ -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..16c0ba6 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 Corporation. */ -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..5dee6d7 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 Corporation. */ -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..5012f6e 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 Corporation. */ -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..19db21e 100644 --- a/src/main/java/com/safecharge/model/RefundPaymentOption.java +++ b/src/main/java/com/nuvei/model/RefundPaymentOption.java @@ -1,9 +1,10 @@ -package com.safecharge.model; +package com.nuvei.model; + +import com.nuvei.util.AtLeastOneFieldPresent; 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 { 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..452123f 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 Corporation. */ -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..41ce51a 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 Corporation. */ -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..c639ef4 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 Corporation. */ -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 81% rename from src/main/java/com/safecharge/model/StoredCredentials.java rename to src/main/java/com/nuvei/model/StoredCredentials.java index 2b1251b..0dc0a30 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 Corporation. */ -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..b36fcdb 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 Corporation. */ -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..a99e4d4 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 Corporation. */ -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..77782cb 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 Corporation. */ -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..059934c 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 Corporation. */ -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..4121b1c 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 Corporation. */ -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..5eb531f 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 Corporation. */ -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..af8991b 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 Corporation. */ -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..98d3bcb 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 Corporation. */ -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..44282c2 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 Corporation. */ -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..cdcdb07 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 Corporation. */ -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..5ae77f9 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 Corporation. */ -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..5e11e09 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 Corporation. */ -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..4ce03ca 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 Corporation. */ -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..4cc2f9c 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 Corporation. */ -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..f3c3a31 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 Corporation. */ -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..b71545d 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 Corporation. */ -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..8638c55 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 Corporation. */ -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..677c228 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 Corporation. */ -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..be67cc9 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 Corporation. */ -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,13 +33,13 @@ */ @ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.API_GENERIC_CHECKSUM_MAPPING) public class AddUPOCreditCardByTempTokenRequest - extends SafechargeRequest { + extends NuveiRequest { /** * 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; /** @@ -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..79aba1d 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 Corporation. */ -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..a970a6f 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 Corporation. */ -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..5ad4c8a 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 Corporation. */ -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..38453d2 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 Corporation. */ -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 9bb406d..ba80c9a 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 Corporation. */ -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..2e039ed 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 Corporation. */ -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 358e501..82f1134 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 Corporation. */ -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. @@ -136,7 +136,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; @@ -272,7 +272,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..a2aea82 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 Corporation. */ -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/nuvei/request/CreateUserRequest.java b/src/main/java/com/nuvei/request/CreateUserRequest.java new file mode 100644 index 0000000..1d741a7 --- /dev/null +++ b/src/main/java/com/nuvei/request/CreateUserRequest.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +package com.nuvei.request; + +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 { + + public static Builder builder() { + return new Builder(); + } + + public static class Builder extends NuveiCashierUserBuilder { + + public CreateUserRequest build() { + CreateUserRequest request = new CreateUserRequest(); + return (CreateUserRequest) ValidationUtils.validate(super.build(request)); + } + } +} \ No newline at end of file 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..1f8d6d8 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 Corporation. */ -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..74d521e 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 Corporation. */ -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..89e5d55 --- /dev/null +++ b/src/main/java/com/nuvei/request/Dynamic3DRequest.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..f29b86b 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 Corporation. */ -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..2215ff0 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 Corporation. */ -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..0c7f689 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 Corporation. */ -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..9f2cdd2 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 Corporation. */ -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..a57945b 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 Corporation. */ -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..9ba8abb 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 Corporation. */ -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..27b0158 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 Corporation. */ -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..1853dd1 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 Corporation. */ -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..2582fb2 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 Corporation. */ -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..22cd74c 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 Corporation. */ -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..cf98303 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 Corporation. */ -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..99c2912 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 Corporation. */ -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 f214b47..947d334 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 Corporation. */ -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; @@ -191,7 +191,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..fc44ffa 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 Corporation. */ -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 84% rename from src/main/java/com/safecharge/request/SafechargeBaseRequest.java rename to src/main/java/com/nuvei/request/NuveiBaseRequest.java index 26c5662..cf131e4 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation'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..6f0d22e 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 Corporation. */ -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 f366cbf..6d25d84 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 Corporation. */ -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..af746c7 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 Corporation. */ -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..f717bd0 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 Corporation. */ -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 72% rename from src/main/java/com/safecharge/request/SafechargeRequest.java rename to src/main/java/com/nuvei/request/NuveiRequest.java index b9286ec..1086104 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation'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 85% rename from src/main/java/com/safecharge/request/SafechargeTransactionRequest.java rename to src/main/java/com/nuvei/request/NuveiTransactionRequest.java index c00203b..fb5502c 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 Corporation. */ -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}) @@ -75,6 +75,8 @@ public abstract class SafechargeTransactionRequest extends SafechargeRequest { private ShippingTrackingDetails shippingTrackingDetails; + private String conversionAffiliateCountryCode; + public String getAmount() { return amount; } @@ -175,9 +177,17 @@ 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("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('\''); @@ -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/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..fa05be8 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 Corporation. */ -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 88% rename from src/main/java/com/safecharge/request/OrderRequestWithDetails.java rename to src/main/java/com/nuvei/request/OrderRequestWithDetails.java index 6d9fe73..17e801a 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 Corporation. */ -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..3c36def 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 Corporation. */ -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 80% rename from src/main/java/com/safecharge/request/PaymentAPMRequest.java rename to src/main/java/com/nuvei/request/PaymentAPMRequest.java index 9d82dda..9d95efa 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 Corporation. */ -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 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}. *
* - * @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..d00d5f6 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 Corporation. */ -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 70% rename from src/main/java/com/safecharge/request/PaymentRequest.java rename to src/main/java/com/nuvei/request/PaymentRequest.java index 5c70f6a..0c14dcf 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 Corporation. */ -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 { @@ -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 @@ -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; @@ -90,6 +90,8 @@ public class PayoutRequest extends SafechargeRequest { private String digitalAssetType; + private String conversionAffiliateCountryCode; + public static PayoutRequest.Builder builder() { return new PayoutRequest.Builder(); } @@ -222,6 +224,14 @@ public void setDigitalAssetType(String digitalAssetType) { this.digitalAssetType = digitalAssetType; } + public String getConversionAffiliateCountryCode() { + return conversionAffiliateCountryCode; + } + + public void setConversionAffiliateCountryCode(String conversionAffiliateCountryCode) { + this.conversionAffiliateCountryCode = conversionAffiliateCountryCode; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("PayoutRequest{"); @@ -241,11 +251,12 @@ public String toString() { sb.append(", companyDetails=").append(companyDetails); sb.append(", currencyConversion=").append(currencyConversion) .append(", digitalAssetType=").append(digitalAssetType); + sb.append(", conversionAffiliateCountryCode=").append(conversionAffiliateCountryCode); sb.append('}'); return sb.toString(); } - public static class Builder extends SafechargeBuilder { + public static class Builder extends NuveiBuilder { private String userTokenId; private String clientUniqueId; @@ -263,6 +274,7 @@ public static class Builder extends SafechargeBuilder { private CompanyDetails companyDetails; private CurrencyConversion currencyConversion; private String digitalAssetType; + private String conversionAffiliateCountryCode; /** * @param userTokenId @@ -389,6 +401,11 @@ public Builder addDigitalAssetType(String digitalAssetType) { return this; } + public Builder addConversionAffiliateCountryCode(String conversionAffiliateCountryCode) { + this.conversionAffiliateCountryCode = conversionAffiliateCountryCode; + return this; + } + /** * Builds the request. * @@ -413,6 +430,7 @@ public PayoutRequest build() { request.setCompanyDetails(companyDetails); request.setCurrencyConversion(currencyConversion); request.setDigitalAssetType(digitalAssetType); + request.setConversionAffiliateCountryCode(conversionAffiliateCountryCode); return ValidationUtils.validate(super.build(request)); } } 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..581af54 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 Corporation. */ -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.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; /** *

@@ -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..11262fa 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 Corporation. */ -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..1caed87 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 Corporation. */ -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..99b854f 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 Corporation. */ -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..03ab51c 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 Corporation. */ -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 87% rename from src/main/java/com/safecharge/request/Verify3dRequest.java rename to src/main/java/com/nuvei/request/Verify3dRequest.java index 4d192b1..0caa959 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 Corporation. */ -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; @@ -192,7 +189,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; @@ -274,7 +271,7 @@ public Builder addDigitalAssetType(String digitalAssetType) { } @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..3c3f132 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 Corporation. */ -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..2585f8f 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 Corporation. */ -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..5d9cc36 100644 --- a/src/main/java/com/safecharge/request/basic/EditUPOBasicRequest.java +++ b/src/main/java/com/nuvei/request/basic/EditUPOBasicRequest.java @@ -1,23 +1,17 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ -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.*; +import com.nuvei.request.NuveiBaseRequest; +import com.nuvei.request.builder.NuveiBuilder; +import com.nuvei.util.Constants; +import com.nuvei.util.ValidationUtils; /** *

@@ -26,11 +20,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 +84,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 +114,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 +124,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..9e3e0c0 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation. * - * @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. + * 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 @@ -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..29f456d 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 Corporation. */ -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..42abffe 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation. * - * @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. + * 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 @@ -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..4d601f5 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 Corporation. */ -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..5811403 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 Corporation. */ -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 e89c3d5..a2a5f54 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 Corporation. */ -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; @@ -500,37 +500,37 @@ public T addDigitalAssetType(String digitalAssetType) { /** * 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.setDigitalAssetType(digitalAssetType); - - 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.setDigitalAssetType(digitalAssetType); + + 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..bceae4a 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 Corporation. */ -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..f97b638 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 Corporation. */ -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 70% rename from src/main/java/com/safecharge/request/builder/SafechargeTransactionBuilder.java rename to src/main/java/com/nuvei/request/builder/NuveiTransactionBuilder.java index e5fc2c3..9a9787d 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 Corporation. */ -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,8 @@ 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); + nuveiTransactionRequest.setConversionAffiliateCountryCode(conversionAffiliateCountryCode); - 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..5e72402 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 Corporation. */ -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..5d02aca 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 Corporation. */ -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..34fbede 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 Corporation. */ -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..47ae97b 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 Corporation. */ -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..263f988 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 Corporation. */ -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..c924278 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 Corporation. */ -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..227583e 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 Corporation. */ -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..89e06fe 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 Corporation. */ -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..41b132e --- /dev/null +++ b/src/main/java/com/nuvei/response/Authorize3dResponse.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..95ff36a --- /dev/null +++ b/src/main/java/com/nuvei/response/CancelSubscriptionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..6bf8eec 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 Corporation. */ -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..b83a0bc 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 Corporation. */ -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..b8c045b 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 Corporation. */ -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..aff8ea1 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 Corporation. */ -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..1863f85 --- /dev/null +++ b/src/main/java/com/nuvei/response/DeleteUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..6320e23 --- /dev/null +++ b/src/main/java/com/nuvei/response/Dynamic3DResponse.java @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..d2cba1a --- /dev/null +++ b/src/main/java/com/nuvei/response/EditUPOAPMResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..2f0e3bb 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 Corporation. */ -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..be489ed --- /dev/null +++ b/src/main/java/com/nuvei/response/EnableUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..cc100f1 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 Corporation. */ -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..b3ab9ce 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 Corporation. */ -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 94% rename from src/main/java/com/safecharge/response/GetPaymentStatusResponse.java rename to src/main/java/com/nuvei/response/GetPaymentStatusResponse.java index 3b06770..4fc265d 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 Corporation. */ -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..e62fc3d 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 Corporation. */ -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..b2cf946 --- /dev/null +++ b/src/main/java/com/nuvei/response/GetSessionTokenResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..29dd97a 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 Corporation. */ -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..301e9a0 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 Corporation. */ -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..f08f560 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 Corporation. */ -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..a203a17 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 Corporation. */ -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..ff68285 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 Corporation. */ -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..4a7f5e8 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 Corporation. */ -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..eb54eb0 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 Corporation. */ -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..3018187 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 Corporation. */ -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..6b3cc87 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 Corporation. */ -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..e653c1d 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 Corporation. */ -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..8c03a24 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 Corporation. */ -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..3c65914 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 Corporation. */ -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..a512537 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 Corporation. */ -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..15fd1ef --- /dev/null +++ b/src/main/java/com/nuvei/response/PaymentResponse.java @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..8faf503 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 Corporation. */ -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..c683ed5 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 Corporation. */ -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..4bcaa49 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 Corporation. */ -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..da32418 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 Corporation. */ -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..5ab2be8 --- /dev/null +++ b/src/main/java/com/nuvei/response/SettleTransactionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..1e7d728 --- /dev/null +++ b/src/main/java/com/nuvei/response/SuspendUPOResponse.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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..818e1e9 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 Corporation. */ -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..04a59bc 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 Corporation. */ -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..4d7072c 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 Corporation. */ -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..a1f9cbe 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 Corporation. */ -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..ba125ad --- /dev/null +++ b/src/main/java/com/nuvei/response/VoidTransactionResponse.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2007 - 2024 Nuvei Corporation. + */ + +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 6aa2674..38ed911 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 Corporation. */ -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..033156c 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 Corporation. */ -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..ca2a233 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 Corporation. */ -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..7bd78cd 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 Corporation. */ -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..79e6175 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 Corporation. */ -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..19204d7 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 Corporation. */ -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..b1d93aa 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 Corporation. */ -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..ecc28c8 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 Corporation. */ -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..94838f4 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation * - * @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..de4daaf 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 Corporation. */ -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..c4140ed 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 Corporation. */ -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..8710b3b 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 Corporation. */ -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 2007 - 2024 Nuvei Corporation * - * @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/CreateUserRequest.java b/src/main/java/com/safecharge/request/CreateUserRequest.java deleted file mode 100644 index ad049e9..0000000 --- a/src/main/java/com/safecharge/request/CreateUserRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. - */ - -package com.safecharge.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; - -@ValidChecksum(orderMappingName = Constants.ChecksumOrderMapping.ADD_CASHIER_USER) -public class CreateUserRequest extends CashierUserRequest { - - public static Builder builder() { - return new Builder(); - } - - public static class Builder extends SafechargeCashierUserBuilder { - - public CreateUserRequest build() { - CreateUserRequest request = new CreateUserRequest(); - return (CreateUserRequest) ValidationUtils.validate(super.build(request)); - } - } -} \ No newline at end of file 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 74% rename from src/test/java/com/safecharge/biz/SafechargeTest.java rename to src/test/java/com/nuvei/biz/NuveiTest.java index 42c4e75..4356e09 100644 --- a/src/test/java/com/safecharge/biz/SafechargeTest.java +++ b/src/test/java/com/nuvei/biz/NuveiTest.java @@ -1,10 +1,10 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ -package com.safecharge.biz; +package com.nuvei.biz; import javax.validation.ConstraintViolationException; @@ -17,39 +17,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.assertEquals; import static org.junit.Assert.assertNotNull; @@ -61,26 +61,26 @@ 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); @@ -91,25 +91,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); @@ -120,7 +120,7 @@ public void shouldExecutePaymentRequestAndReturnResponse() throws SafechargeExce 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,8 +131,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, @@ -141,15 +141,15 @@ public void shouldThrowExceptionIfPaymentRequestIsExecutedWithoutInitializeReque 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 - 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); @@ -167,8 +167,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", @@ -176,11 +176,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); @@ -200,8 +200,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, @@ -211,11 +211,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); @@ -232,26 +232,26 @@ 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); sut.initialize("merchantKey", "id", "siteId", "localhost", Constants.HashAlgorithm.SHA256); VoidTransactionResponse response = sut.voidTransaction("clientRequestId", "relatedTransactioId", "11", "BGN", "authCode", - 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(VoidTransactionRequest.class)); @@ -262,20 +262,20 @@ 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", - null, null, null, null, null, null, null); + null, null, null, null, null, null, null, null); } @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); @@ -293,8 +293,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", @@ -302,18 +302,18 @@ 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); 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, null, "relatedTransactioId", null, null, null, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -324,11 +324,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); @@ -338,7 +338,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, null, refundPaymentOption, null, null); verify(executor).execute(any(GetSessionTokenRequest.class)); verify(executor).execute(any(RefundTransactionRequest.class)); @@ -349,20 +349,20 @@ 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", - null, null, null, "relatedTransactionId", null, null, null, null); + null, null, null, "relatedTransactionId", null, null, null, null, null); } @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); @@ -380,8 +380,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, @@ -389,11 +389,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); @@ -413,8 +413,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", @@ -424,11 +424,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); @@ -445,19 +445,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); @@ -475,8 +475,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", @@ -484,11 +484,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); @@ -505,19 +505,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); @@ -535,8 +535,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", @@ -544,8 +544,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..3cf833d 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 Corporation. */ -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 83% rename from src/test/java/com/safecharge/test/ValidationsTest.java rename to src/test/java/com/nuvei/test/ValidationsTest.java index 28ba025..aa04582 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 Corporation. */ -package com.safecharge.test; +package com.nuvei.test; import java.util.ArrayList; import java.util.HashMap; @@ -13,60 +13,28 @@ import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; +import com.nuvei.request.*; 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.NuveiBaseRequest; +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 +43,7 @@ /** * - * @author Nikola Dichev + * @author Nikola Dichev * @since 2/24/2017 */ public class ValidationsTest { @@ -263,13 +231,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 +258,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 +281,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 +291,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 +310,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 +318,7 @@ public void testSuccessfulValidation_Authorization3DRequest() { .addCurrency(validCurrencyCode) .addItem(dummyValidItem) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -370,12 +338,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 +362,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 +386,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 +400,7 @@ public void testSuccessfulValidation_CreateSubscriptionRequest() { .addURLDetails("failureUrl", "pendingUrl", "successUrl", "notificationUrl") .addUserPaymentOption("cvv", "111111") .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -481,14 +449,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 +478,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 +502,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 +524,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 +547,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 +569,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 +599,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 +625,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,7 +639,91 @@ public void testSuccessfulValidation_PaymentAPMRequest() { .addURLDetails(dummyValidUrlDetails) .addPaymentMethod(validPaymentMethodName) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); + } + + @Test + public void testSuccessfulValidation_withAddressLines_PaymentAPMRequest() { + NuveiBaseRequest nuveiRequest = 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(nuveiRequest != 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 @@ -762,7 +814,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 +831,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 +846,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 +873,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 +900,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 +926,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 +934,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 +955,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 +982,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 +994,7 @@ public void testSuccessfulValidation_PayoutRequest() { .addClientUniqueId(dummyClientUniqueId) .addSubMethodDetails(dummySubmethod) .build(); - assertTrue(safechargeRequest != null); + assertTrue(nuveiRequest != null); } @Test @@ -961,7 +1013,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 +1025,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 +1051,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 +1074,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 +1085,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 +1097,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 +1107,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 +1119,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 +1137,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 +1154,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 +1171,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 74% rename from src/test/java/com/safecharge/test/workflow/APMWorkflowTest.java rename to src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java index 9775024..39c525f 100644 --- a/src/test/java/com/safecharge/test/workflow/APMWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/APMWorkflowTest.java @@ -1,37 +1,31 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ -package com.safecharge.test.workflow; +package com.nuvei.test.workflow; import java.io.IOException; 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; 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.NuveiBaseRequest; +import com.nuvei.response.OpenOrderResponse; +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 +46,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 +58,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 +73,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 +84,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 +101,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 +109,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 +123,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 +146,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 90% rename from src/test/java/com/safecharge/test/workflow/CompleteFunctionalTest.java rename to src/test/java/com/nuvei/test/workflow/CompleteFunctionalTest.java index 2db984f..bc90996 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 Corporation. */ -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 72% rename from src/test/java/com/safecharge/test/workflow/CreditCardWorkflowTest.java rename to src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java index c90e499..c3f9040 100644 --- a/src/test/java/com/safecharge/test/workflow/CreditCardWorkflowTest.java +++ b/src/test/java/com/nuvei/test/workflow/CreditCardWorkflowTest.java @@ -1,45 +1,32 @@ /* - * Copyright (C) 2007 - 2023 SafeCharge International Group Limited. + * Copyright (C) 2007 - 2024 Nuvei Corporation. */ -package com.safecharge.test.workflow; - -import static org.mockito.Mockito.when; +package com.nuvei.test.workflow; import java.io.IOException; 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; 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.NuveiBaseRequest; +import com.nuvei.response.OpenOrderResponse; +import com.nuvei.response.PaymentCCResponse; +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 +48,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 +60,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 +74,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 +85,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 +102,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 +110,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 +124,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 +147,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 95% rename from src/test/java/com/safecharge/test/workflow/TestVariables.java rename to src/test/java/com/nuvei/test/workflow/TestVariables.java index 561d9ca..e8c83d8 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 Corporation. */ -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..95e62b7 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 Corporation. */ -package com.safecharge.test.workflow.paymentCC; +package com.nuvei.test.workflow.paymentCC; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -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,23 +19,21 @@ 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.model.MerchantInfo; +import com.nuvei.request.GetSessionTokenRequest; +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..b16aebd 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 Corporation. */ -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..eec21f8 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,