From 378cb448f9dec15453e9234bcbbbed5968984d5d Mon Sep 17 00:00:00 2001 From: wallee-deployment-user Date: Mon, 12 Feb 2024 15:46:55 +0100 Subject: [PATCH] Release 8.0.0 --- .travis.yml | 17 - README.md | 8 +- build.gradle | 2 +- build.sbt | 24 - pom.xml | 10 +- .../java/com/wallee/sdk/DefaultHeaders.java | 2 +- .../{ => exception}/WalleeSdkException.java | 16 +- .../model/AbstractWebhookListenerUpdate.java | 29 +- .../model/PaymentConnectorConfiguration.java | 18 +- .../com/wallee/sdk/model/WebhookListener.java | 20 +- .../sdk/model/WebhookListenerCreate.java | 6 +- .../sdk/model/WebhookListenerUpdate.java | 6 +- .../wallee/sdk/service/AccountService.java | 4 +- .../sdk/service/AnalyticsQueryService.java | 4 +- .../sdk/service/ApplicationUserService.java | 4 +- .../sdk/service/BankAccountService.java | 4 +- .../sdk/service/BankTransactionService.java | 4 +- .../sdk/service/CardProcessingService.java | 4 +- .../sdk/service/ChargeAttemptService.java | 4 +- .../service/ChargeBankTransactionService.java | 4 +- .../ChargeFlowLevelPaymentLinkService.java | 4 +- .../sdk/service/ChargeFlowLevelService.java | 4 +- .../wallee/sdk/service/ChargeFlowService.java | 4 +- .../sdk/service/ConditionTypeService.java | 4 +- .../wallee/sdk/service/CountryService.java | 4 +- .../sdk/service/CountryStateService.java | 4 +- .../service/CurrencyBankAccountService.java | 4 +- .../wallee/sdk/service/CurrencyService.java | 4 +- .../sdk/service/CustomerAddressService.java | 4 +- .../sdk/service/CustomerCommentService.java | 4 +- .../wallee/sdk/service/CustomerService.java | 4 +- .../service/DebtCollectionCaseService.java | 4 +- .../DebtCollectorConfigurationService.java | 4 +- .../sdk/service/DebtCollectorService.java | 4 +- .../service/DeliveryIndicationService.java | 4 +- .../sdk/service/DocumentTemplateService.java | 4 +- .../service/DocumentTemplateTypeService.java | 4 +- ...xternalTransferBankTransactionService.java | 4 +- .../wallee/sdk/service/HumanUserService.java | 4 +- .../service/InstallmentPaymentService.java | 4 +- .../InstallmentPaymentSliceService.java | 4 +- .../InstallmentPlanCalculationService.java | 4 +- .../InstallmentPlanConfigurationService.java | 4 +- ...tallmentPlanSliceConfigurationService.java | 4 +- ...nternalTransferBankTransactionService.java | 4 +- ...econciliationRecordInvoiceLinkService.java | 4 +- .../InvoiceReconciliationRecordService.java | 4 +- .../service/InvoiceReimbursementService.java | 4 +- .../service/LabelDescriptionGroupService.java | 4 +- .../sdk/service/LabelDescriptionService.java | 4 +- .../wallee/sdk/service/LanguageService.java | 4 +- .../service/LegalOrganizationFormService.java | 4 +- .../wallee/sdk/service/ManualTaskService.java | 4 +- .../sdk/service/MerticUsageService.java | 4 +- .../PaymentConnectorConfigurationService.java | 4 +- .../sdk/service/PaymentConnectorService.java | 4 +- .../sdk/service/PaymentLinkService.java | 4 +- .../service/PaymentMethodBrandService.java | 4 +- .../PaymentMethodConfigurationService.java | 4 +- .../sdk/service/PaymentMethodService.java | 4 +- .../PaymentProcessorConfigurationService.java | 4 +- .../sdk/service/PaymentProcessorService.java | 4 +- .../sdk/service/PaymentTerminalService.java | 4 +- .../service/PaymentTerminalTillService.java | 4 +- ...mentTerminalTransactionSummaryService.java | 4 +- .../sdk/service/PaymentWebAppService.java | 4 +- .../wallee/sdk/service/PermissionService.java | 4 +- .../service/RefundBankTransactionService.java | 4 +- .../sdk/service/RefundCommentService.java | 4 +- .../RefundRecoveryBankTransactionService.java | 4 +- .../com/wallee/sdk/service/RefundService.java | 4 +- .../service/ShopifyRecurringOrderService.java | 4 +- .../sdk/service/ShopifySubscriberService.java | 4 +- .../ShopifySubscriptionProductService.java | 4 +- .../service/ShopifySubscriptionService.java | 4 +- .../ShopifySubscriptionSuspensionService.java | 4 +- .../ShopifySubscriptionVersionService.java | 4 +- .../service/ShopifyTransactionService.java | 4 +- .../com/wallee/sdk/service/SpaceService.java | 4 +- .../sdk/service/StaticValueService.java | 4 +- .../wallee/sdk/service/SubscriberService.java | 4 +- .../service/SubscriptionAffiliateService.java | 4 +- .../service/SubscriptionChargeService.java | 4 +- .../SubscriptionLedgerEntryService.java | 4 +- .../service/SubscriptionMetricService.java | 4 +- .../SubscriptionMetricUsageService.java | 4 +- .../SubscriptionPeriodBillService.java | 4 +- ...scriptionProductComponentGroupService.java | 4 +- .../SubscriptionProductComponentService.java | 4 +- .../SubscriptionProductFeeTierService.java | 4 +- .../SubscriptionProductMeteredFeeService.java | 4 +- .../SubscriptionProductPeriodFeeService.java | 4 +- .../SubscriptionProductRetirementService.java | 4 +- .../service/SubscriptionProductService.java | 4 +- .../SubscriptionProductSetupFeeService.java | 4 +- ...iptionProductVersionRetirementService.java | 4 +- .../SubscriptionProductVersionService.java | 4 +- .../sdk/service/SubscriptionService.java | 4 +- .../SubscriptionSuspensionService.java | 4 +- .../service/SubscriptionVersionService.java | 4 +- .../com/wallee/sdk/service/TokenService.java | 4 +- .../sdk/service/TokenVersionService.java | 4 +- .../service/TransactionCommentService.java | 4 +- .../service/TransactionCompletionService.java | 4 +- .../sdk/service/TransactionIframeService.java | 4 +- .../TransactionInvoiceCommentService.java | 4 +- .../service/TransactionInvoiceService.java | 4 +- .../service/TransactionLightboxService.java | 4 +- .../TransactionLineItemVersionService.java | 4 +- .../service/TransactionMobileSdkService.java | 4 +- .../TransactionPaymentPageService.java | 4 +- .../sdk/service/TransactionService.java | 4 +- .../service/TransactionTerminalService.java | 4 +- .../sdk/service/TransactionVoidService.java | 4 +- .../sdk/service/UserAccountRoleService.java | 4 +- .../sdk/service/UserSpaceRoleService.java | 4 +- .../com/wallee/sdk/service/WebAppService.java | 4 +- .../sdk/service/WebhookEncryptionService.java | 6 +- .../sdk/service/WebhookListenerService.java | 4 +- .../wallee/sdk/service/WebhookUrlService.java | 4 +- .../wallee/sdk/{ => util}/EncryptionUtil.java | 6 +- .../wallee/sdk/{ => util}/URIBuilderUtil.java | 2 +- .../wallee/sdk/test/EncryptionUtilTest.java | 125 ++++ .../wallee/sdk/test/RefundServiceTest.java | 217 ------ .../java/com/wallee/sdk/test/RefundTest.java | 166 +++++ .../com/wallee/sdk/test/TestConstants.java | 23 + .../java/com/wallee/sdk/test/TestUtils.java | 53 ++ .../TransactionCompletionServiceTest.java | 348 +++++----- .../test/TransactionIframeServiceTest.java | 90 +-- .../test/TransactionLightboxServiceTest.java | 90 +-- .../TransactionPaymentPageServiceTest.java | 91 +-- .../sdk/test/TransactionServiceTest.java | 634 ++++++++---------- 132 files changed, 1179 insertions(+), 1258 deletions(-) delete mode 100644 .travis.yml delete mode 100644 build.sbt rename src/main/java/com/wallee/sdk/{ => exception}/WalleeSdkException.java (79%) rename src/main/java/com/wallee/sdk/{ => util}/EncryptionUtil.java (97%) rename src/main/java/com/wallee/sdk/{ => util}/URIBuilderUtil.java (99%) create mode 100644 src/test/java/com/wallee/sdk/test/EncryptionUtilTest.java delete mode 100644 src/test/java/com/wallee/sdk/test/RefundServiceTest.java create mode 100644 src/test/java/com/wallee/sdk/test/RefundTest.java create mode 100644 src/test/java/com/wallee/sdk/test/TestConstants.java create mode 100644 src/test/java/com/wallee/sdk/test/TestUtils.java diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 70cb81a6..00000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -# -# Generated by: https://github.com/swagger-api/swagger-codegen.git -# -language: java -jdk: - - oraclejdk8 - - oraclejdk7 -before_install: - # ensure gradlew has proper permission - - chmod a+x ./gradlew -script: - # test using maven - - mvn test - # uncomment below to test using gradle - # - gradle test - # uncomment below to test using sbt - # - sbt test diff --git a/README.md b/README.md index c2a1ad86..a9cb3714 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://travis-ci.org/wallee-payment/java-sdk.svg?branch=master)](https://travis-ci.org/wallee-payment/java-sdk) - # wallee Java Library The wallee Java library wraps around the wallee API. This library facilitates your interaction with various services such as transactions, accounts, and subscriptions. @@ -23,7 +21,7 @@ Add this dependency to your project's POM: com.wallee wallee-java-sdk - 7.2.0 + 8.0.0 compile ``` @@ -33,7 +31,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "com.wallee:wallee-java-sdk:7.2.0" +compile "com.wallee:wallee-java-sdk:8.0.0" ``` ### Others @@ -46,7 +44,7 @@ mvn clean package Then manually install the following JARs: -* `target/wallee-java-sdk-7.2.0.jar` +* `target/wallee-java-sdk-8.0.0.jar` * `target/lib/*.jar` ## Usage diff --git a/build.gradle b/build.gradle index 4b724a06..4bf691aa 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' group = 'com.wallee' -version = '7.2.0' +version = '8.0.0' buildscript { repositories { diff --git a/build.sbt b/build.sbt deleted file mode 100644 index 341b8e70..00000000 --- a/build.sbt +++ /dev/null @@ -1,24 +0,0 @@ -lazy val root = (project in file(".")). - settings( - organization := "com.wallee", - name := "wallee-java-sdk", - version := "7.2.0", - scalaVersion := "2.11.4", - scalacOptions ++= Seq("-feature"), - javacOptions in compile ++= Seq("-Xlint:deprecation"), - publishArtifact in (Compile, packageDoc) := false, - resolvers += Resolver.mavenLocal, - libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.17", - "com.google.api-client" % "google-api-client" % "2.2.0" "compile" exclude("com.google.guava", "guava"), - "com.google.guava" % "guava" % "32.1.2-jre" "compile", - "org.glassfish.jersey.core" % "jersey-common" % "2.34" "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.14.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.14.1" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.14.1" % "compile", - "org.apache.httpcomponents" % "httpclient" % "4.5.14" % "compile" exclude("commons-codec", "commons-codec"), - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.14.1" % "compile", - "junit" % "junit" % "4.13.2" % "test", - "com.novocode" % "junit-interface" % "0.10" % "test" - ) - ) diff --git a/pom.xml b/pom.xml index 5aceef3c..8171260b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ wallee-java-sdk jar wallee-java-sdk - 7.2.0 + 8.0.0 https://www.wallee.com The SDK for simplifying the integration with wallee API. @@ -66,12 +66,12 @@ maven-surefire-plugin 2.12 - + loggerPath conf/log4j.properties - + -Xms512m -Xmx1500m methods pertest @@ -154,6 +154,10 @@ org.apache.maven.plugins maven-javadoc-plugin 2.10.4 + + -Xdoclint:-missing + true + attach-javadocs diff --git a/src/main/java/com/wallee/sdk/DefaultHeaders.java b/src/main/java/com/wallee/sdk/DefaultHeaders.java index c3860160..77543171 100644 --- a/src/main/java/com/wallee/sdk/DefaultHeaders.java +++ b/src/main/java/com/wallee/sdk/DefaultHeaders.java @@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException { private HttpHeaders getDefaultHeaders() { HttpHeaders headers = new HttpHeaders(); - headers.put("x-meta-sdk-version", "7.2.0"); + headers.put("x-meta-sdk-version", "8.0.0"); headers.put("x-meta-sdk-language", "java"); headers.put("x-meta-sdk-provider", "wallee"); headers.put("x-meta-sdk-language-version", System.getProperty("java.version")); diff --git a/src/main/java/com/wallee/sdk/WalleeSdkException.java b/src/main/java/com/wallee/sdk/exception/WalleeSdkException.java similarity index 79% rename from src/main/java/com/wallee/sdk/WalleeSdkException.java rename to src/main/java/com/wallee/sdk/exception/WalleeSdkException.java index 90c2f39e..9a9a0605 100644 --- a/src/main/java/com/wallee/sdk/WalleeSdkException.java +++ b/src/main/java/com/wallee/sdk/exception/WalleeSdkException.java @@ -17,10 +17,12 @@ */ -package com.wallee.sdk; +package com.wallee.sdk.exception; + +import com.wallee.sdk.ErrorCode; /** - * Exception thrown when the Wallee SDK API call results in an invalid response. + * Exception thrown when the SDK API call results in an invalid response. */ public class WalleeSdkException extends RuntimeException { @@ -33,10 +35,8 @@ public class WalleeSdkException extends RuntimeException { /** * Constructor. * - * @param code - * the Wallee SDK error code - * @param message - * the exception message details + * @param code SDK error code + * @param message exception message details */ public WalleeSdkException(ErrorCode code, String message) { super(); @@ -45,14 +45,14 @@ public WalleeSdkException(ErrorCode code, String message) { } /** - * @return the Wallee SDK error code + * @return SDK error code */ public ErrorCode getCode() { return this.code; } /** - * @return the Wallee SDK error message + * @return SDK error message */ public String getMessage() { return this.message; diff --git a/src/main/java/com/wallee/sdk/model/AbstractWebhookListenerUpdate.java b/src/main/java/com/wallee/sdk/model/AbstractWebhookListenerUpdate.java index d181cd4c..d3417e9b 100644 --- a/src/main/java/com/wallee/sdk/model/AbstractWebhookListenerUpdate.java +++ b/src/main/java/com/wallee/sdk/model/AbstractWebhookListenerUpdate.java @@ -38,6 +38,10 @@ public class AbstractWebhookListenerUpdate { + @JsonProperty("enablePayloadSignatureAndState") + protected Boolean enablePayloadSignatureAndState = null; + + @JsonProperty("entityStates") protected List entityStates = null; @@ -55,6 +59,25 @@ public class AbstractWebhookListenerUpdate { + public AbstractWebhookListenerUpdate enablePayloadSignatureAndState(Boolean enablePayloadSignatureAndState) { + this.enablePayloadSignatureAndState = enablePayloadSignatureAndState; + return this; + } + + /** + * Whether signature header and state property are enabled in webhook payload. + * @return enablePayloadSignatureAndState + **/ + @ApiModelProperty(value = "Whether signature header and state property are enabled in webhook payload.") + public Boolean isEnablePayloadSignatureAndState() { + return enablePayloadSignatureAndState; + } + + public void setEnablePayloadSignatureAndState(Boolean enablePayloadSignatureAndState) { + this.enablePayloadSignatureAndState = enablePayloadSignatureAndState; + } + + public AbstractWebhookListenerUpdate entityStates(List entityStates) { this.entityStates = entityStates; return this; @@ -149,7 +172,8 @@ public boolean equals(java.lang.Object o) { return false; } AbstractWebhookListenerUpdate abstractWebhookListenerUpdate = (AbstractWebhookListenerUpdate) o; - return Objects.equals(this.entityStates, abstractWebhookListenerUpdate.entityStates) && + return Objects.equals(this.enablePayloadSignatureAndState, abstractWebhookListenerUpdate.enablePayloadSignatureAndState) && + Objects.equals(this.entityStates, abstractWebhookListenerUpdate.entityStates) && Objects.equals(this.name, abstractWebhookListenerUpdate.name) && Objects.equals(this.notifyEveryChange, abstractWebhookListenerUpdate.notifyEveryChange) && Objects.equals(this.state, abstractWebhookListenerUpdate.state); @@ -157,7 +181,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(entityStates, name, notifyEveryChange, state); + return Objects.hash(enablePayloadSignatureAndState, entityStates, name, notifyEveryChange, state); } @@ -166,6 +190,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AbstractWebhookListenerUpdate {\n"); + sb.append(" enablePayloadSignatureAndState: ").append(toIndentedString(enablePayloadSignatureAndState)).append("\n"); sb.append(" entityStates: ").append(toIndentedString(entityStates)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" notifyEveryChange: ").append(toIndentedString(notifyEveryChange)).append("\n"); diff --git a/src/main/java/com/wallee/sdk/model/PaymentConnectorConfiguration.java b/src/main/java/com/wallee/sdk/model/PaymentConnectorConfiguration.java index 3e5b4313..0ac76eb6 100644 --- a/src/main/java/com/wallee/sdk/model/PaymentConnectorConfiguration.java +++ b/src/main/java/com/wallee/sdk/model/PaymentConnectorConfiguration.java @@ -67,6 +67,10 @@ public class PaymentConnectorConfiguration { protected Long id = null; + @JsonProperty("imagePath") + protected String imagePath = null; + + @JsonProperty("linkedSpaceId") protected Long linkedSpaceId = null; @@ -160,6 +164,16 @@ public Long getId() { } + /** + * + * @return imagePath + **/ + @ApiModelProperty(value = "") + public String getImagePath() { + return imagePath; + } + + /** * The ID of the space this object belongs to. * @return linkedSpaceId @@ -256,6 +270,7 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.enabledSalesChannels, paymentConnectorConfiguration.enabledSalesChannels) && Objects.equals(this.enabledSpaceViews, paymentConnectorConfiguration.enabledSpaceViews) && Objects.equals(this.id, paymentConnectorConfiguration.id) && + Objects.equals(this.imagePath, paymentConnectorConfiguration.imagePath) && Objects.equals(this.linkedSpaceId, paymentConnectorConfiguration.linkedSpaceId) && Objects.equals(this.name, paymentConnectorConfiguration.name) && Objects.equals(this.paymentMethodConfiguration, paymentConnectorConfiguration.paymentMethodConfiguration) && @@ -268,7 +283,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(applicableForTransactionProcessing, conditions, connector, enabledSalesChannels, enabledSpaceViews, id, linkedSpaceId, name, paymentMethodConfiguration, plannedPurgeDate, priority, processorConfiguration, state, version); + return Objects.hash(applicableForTransactionProcessing, conditions, connector, enabledSalesChannels, enabledSpaceViews, id, imagePath, linkedSpaceId, name, paymentMethodConfiguration, plannedPurgeDate, priority, processorConfiguration, state, version); } @@ -283,6 +298,7 @@ public String toString() { sb.append(" enabledSalesChannels: ").append(toIndentedString(enabledSalesChannels)).append("\n"); sb.append(" enabledSpaceViews: ").append(toIndentedString(enabledSpaceViews)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" imagePath: ").append(toIndentedString(imagePath)).append("\n"); sb.append(" linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" paymentMethodConfiguration: ").append(toIndentedString(paymentMethodConfiguration)).append("\n"); diff --git a/src/main/java/com/wallee/sdk/model/WebhookListener.java b/src/main/java/com/wallee/sdk/model/WebhookListener.java index c854a75a..5404b33f 100644 --- a/src/main/java/com/wallee/sdk/model/WebhookListener.java +++ b/src/main/java/com/wallee/sdk/model/WebhookListener.java @@ -42,6 +42,10 @@ public class WebhookListener { + @JsonProperty("enablePayloadSignatureAndState") + protected Boolean enablePayloadSignatureAndState = null; + + @JsonProperty("entity") protected Long entity = null; @@ -87,6 +91,16 @@ public class WebhookListener { + /** + * Whether signature header and state property are enabled in webhook payload. + * @return enablePayloadSignatureAndState + **/ + @ApiModelProperty(value = "Whether signature header and state property are enabled in webhook payload.") + public Boolean isEnablePayloadSignatureAndState() { + return enablePayloadSignatureAndState; + } + + /** * The entity that is to be monitored. * @return entity @@ -207,7 +221,8 @@ public boolean equals(java.lang.Object o) { return false; } WebhookListener webhookListener = (WebhookListener) o; - return Objects.equals(this.entity, webhookListener.entity) && + return Objects.equals(this.enablePayloadSignatureAndState, webhookListener.enablePayloadSignatureAndState) && + Objects.equals(this.entity, webhookListener.entity) && Objects.equals(this.entityStates, webhookListener.entityStates) && Objects.equals(this.id, webhookListener.id) && Objects.equals(this.identity, webhookListener.identity) && @@ -222,7 +237,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(entity, entityStates, id, identity, linkedSpaceId, name, notifyEveryChange, plannedPurgeDate, state, url, version); + return Objects.hash(enablePayloadSignatureAndState, entity, entityStates, id, identity, linkedSpaceId, name, notifyEveryChange, plannedPurgeDate, state, url, version); } @@ -231,6 +246,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class WebhookListener {\n"); + sb.append(" enablePayloadSignatureAndState: ").append(toIndentedString(enablePayloadSignatureAndState)).append("\n"); sb.append(" entity: ").append(toIndentedString(entity)).append("\n"); sb.append(" entityStates: ").append(toIndentedString(entityStates)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); diff --git a/src/main/java/com/wallee/sdk/model/WebhookListenerCreate.java b/src/main/java/com/wallee/sdk/model/WebhookListenerCreate.java index 4a948dc2..43a2eada 100644 --- a/src/main/java/com/wallee/sdk/model/WebhookListenerCreate.java +++ b/src/main/java/com/wallee/sdk/model/WebhookListenerCreate.java @@ -118,7 +118,8 @@ public boolean equals(java.lang.Object o) { return false; } WebhookListenerCreate webhookListenerCreate = (WebhookListenerCreate) o; - return Objects.equals(this.entityStates, webhookListenerCreate.entityStates) && + return Objects.equals(this.enablePayloadSignatureAndState, webhookListenerCreate.enablePayloadSignatureAndState) && + Objects.equals(this.entityStates, webhookListenerCreate.entityStates) && Objects.equals(this.name, webhookListenerCreate.name) && Objects.equals(this.notifyEveryChange, webhookListenerCreate.notifyEveryChange) && Objects.equals(this.state, webhookListenerCreate.state) && @@ -130,7 +131,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(entityStates, name, notifyEveryChange, state, entity, identity, url, super.hashCode()); + return Objects.hash(enablePayloadSignatureAndState, entityStates, name, notifyEveryChange, state, entity, identity, url, super.hashCode()); } @@ -139,6 +140,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class WebhookListenerCreate {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" enablePayloadSignatureAndState: ").append(toIndentedString(enablePayloadSignatureAndState)).append("\n"); sb.append(" entityStates: ").append(toIndentedString(entityStates)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" notifyEveryChange: ").append(toIndentedString(notifyEveryChange)).append("\n"); diff --git a/src/main/java/com/wallee/sdk/model/WebhookListenerUpdate.java b/src/main/java/com/wallee/sdk/model/WebhookListenerUpdate.java index 1b492089..66aec5f5 100644 --- a/src/main/java/com/wallee/sdk/model/WebhookListenerUpdate.java +++ b/src/main/java/com/wallee/sdk/model/WebhookListenerUpdate.java @@ -95,7 +95,8 @@ public boolean equals(java.lang.Object o) { return false; } WebhookListenerUpdate webhookListenerUpdate = (WebhookListenerUpdate) o; - return Objects.equals(this.entityStates, webhookListenerUpdate.entityStates) && + return Objects.equals(this.enablePayloadSignatureAndState, webhookListenerUpdate.enablePayloadSignatureAndState) && + Objects.equals(this.entityStates, webhookListenerUpdate.entityStates) && Objects.equals(this.name, webhookListenerUpdate.name) && Objects.equals(this.notifyEveryChange, webhookListenerUpdate.notifyEveryChange) && Objects.equals(this.state, webhookListenerUpdate.state) && @@ -106,7 +107,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(entityStates, name, notifyEveryChange, state, id, version, super.hashCode()); + return Objects.hash(enablePayloadSignatureAndState, entityStates, name, notifyEveryChange, state, id, version, super.hashCode()); } @@ -115,6 +116,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class WebhookListenerUpdate {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" enablePayloadSignatureAndState: ").append(toIndentedString(enablePayloadSignatureAndState)).append("\n"); sb.append(" entityStates: ").append(toIndentedString(entityStates)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" notifyEveryChange: ").append(toIndentedString(notifyEveryChange)).append("\n"); diff --git a/src/main/java/com/wallee/sdk/service/AccountService.java b/src/main/java/com/wallee/sdk/service/AccountService.java index 0fbda51f..b40f38ba 100644 --- a/src/main/java/com/wallee/sdk/service/AccountService.java +++ b/src/main/java/com/wallee/sdk/service/AccountService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.Account; diff --git a/src/main/java/com/wallee/sdk/service/AnalyticsQueryService.java b/src/main/java/com/wallee/sdk/service/AnalyticsQueryService.java index 81114cc3..b8d9dddb 100644 --- a/src/main/java/com/wallee/sdk/service/AnalyticsQueryService.java +++ b/src/main/java/com/wallee/sdk/service/AnalyticsQueryService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.AnalyticsQuery; diff --git a/src/main/java/com/wallee/sdk/service/ApplicationUserService.java b/src/main/java/com/wallee/sdk/service/ApplicationUserService.java index 0609d41b..df325ca5 100644 --- a/src/main/java/com/wallee/sdk/service/ApplicationUserService.java +++ b/src/main/java/com/wallee/sdk/service/ApplicationUserService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ApplicationUser; diff --git a/src/main/java/com/wallee/sdk/service/BankAccountService.java b/src/main/java/com/wallee/sdk/service/BankAccountService.java index b203a733..6b76fe23 100644 --- a/src/main/java/com/wallee/sdk/service/BankAccountService.java +++ b/src/main/java/com/wallee/sdk/service/BankAccountService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.BankAccount; diff --git a/src/main/java/com/wallee/sdk/service/BankTransactionService.java b/src/main/java/com/wallee/sdk/service/BankTransactionService.java index 69982fd5..ca1e9b70 100644 --- a/src/main/java/com/wallee/sdk/service/BankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/BankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.BankTransaction; diff --git a/src/main/java/com/wallee/sdk/service/CardProcessingService.java b/src/main/java/com/wallee/sdk/service/CardProcessingService.java index 58d9061b..2f486073 100644 --- a/src/main/java/com/wallee/sdk/service/CardProcessingService.java +++ b/src/main/java/com/wallee/sdk/service/CardProcessingService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.AuthenticatedCardDataCreate; diff --git a/src/main/java/com/wallee/sdk/service/ChargeAttemptService.java b/src/main/java/com/wallee/sdk/service/ChargeAttemptService.java index 18280ce9..f8ba1f9d 100644 --- a/src/main/java/com/wallee/sdk/service/ChargeAttemptService.java +++ b/src/main/java/com/wallee/sdk/service/ChargeAttemptService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeAttempt; diff --git a/src/main/java/com/wallee/sdk/service/ChargeBankTransactionService.java b/src/main/java/com/wallee/sdk/service/ChargeBankTransactionService.java index bfc7cb54..a41f45e9 100644 --- a/src/main/java/com/wallee/sdk/service/ChargeBankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/ChargeBankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeBankTransaction; diff --git a/src/main/java/com/wallee/sdk/service/ChargeFlowLevelPaymentLinkService.java b/src/main/java/com/wallee/sdk/service/ChargeFlowLevelPaymentLinkService.java index 960fa229..db0af5f0 100644 --- a/src/main/java/com/wallee/sdk/service/ChargeFlowLevelPaymentLinkService.java +++ b/src/main/java/com/wallee/sdk/service/ChargeFlowLevelPaymentLinkService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeFlowLevelPaymentLink; diff --git a/src/main/java/com/wallee/sdk/service/ChargeFlowLevelService.java b/src/main/java/com/wallee/sdk/service/ChargeFlowLevelService.java index bca7fec0..5e3aa216 100644 --- a/src/main/java/com/wallee/sdk/service/ChargeFlowLevelService.java +++ b/src/main/java/com/wallee/sdk/service/ChargeFlowLevelService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeFlowLevel; diff --git a/src/main/java/com/wallee/sdk/service/ChargeFlowService.java b/src/main/java/com/wallee/sdk/service/ChargeFlowService.java index 3f4398cf..be11319b 100644 --- a/src/main/java/com/wallee/sdk/service/ChargeFlowService.java +++ b/src/main/java/com/wallee/sdk/service/ChargeFlowService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeFlow; diff --git a/src/main/java/com/wallee/sdk/service/ConditionTypeService.java b/src/main/java/com/wallee/sdk/service/ConditionTypeService.java index 0190f077..6404c783 100644 --- a/src/main/java/com/wallee/sdk/service/ConditionTypeService.java +++ b/src/main/java/com/wallee/sdk/service/ConditionTypeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CountryService.java b/src/main/java/com/wallee/sdk/service/CountryService.java index 3d92b57b..e07d1535 100644 --- a/src/main/java/com/wallee/sdk/service/CountryService.java +++ b/src/main/java/com/wallee/sdk/service/CountryService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CountryStateService.java b/src/main/java/com/wallee/sdk/service/CountryStateService.java index 0d22f2c2..88f13e0e 100644 --- a/src/main/java/com/wallee/sdk/service/CountryStateService.java +++ b/src/main/java/com/wallee/sdk/service/CountryStateService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CurrencyBankAccountService.java b/src/main/java/com/wallee/sdk/service/CurrencyBankAccountService.java index 06839efa..46b6d049 100644 --- a/src/main/java/com/wallee/sdk/service/CurrencyBankAccountService.java +++ b/src/main/java/com/wallee/sdk/service/CurrencyBankAccountService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CurrencyService.java b/src/main/java/com/wallee/sdk/service/CurrencyService.java index b20e70b0..592e5935 100644 --- a/src/main/java/com/wallee/sdk/service/CurrencyService.java +++ b/src/main/java/com/wallee/sdk/service/CurrencyService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CustomerAddressService.java b/src/main/java/com/wallee/sdk/service/CustomerAddressService.java index 6e1a6105..3f6ada32 100644 --- a/src/main/java/com/wallee/sdk/service/CustomerAddressService.java +++ b/src/main/java/com/wallee/sdk/service/CustomerAddressService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CustomerCommentService.java b/src/main/java/com/wallee/sdk/service/CustomerCommentService.java index cb835c91..2cda29bf 100644 --- a/src/main/java/com/wallee/sdk/service/CustomerCommentService.java +++ b/src/main/java/com/wallee/sdk/service/CustomerCommentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/CustomerService.java b/src/main/java/com/wallee/sdk/service/CustomerService.java index 2a6e12a6..d543dddc 100644 --- a/src/main/java/com/wallee/sdk/service/CustomerService.java +++ b/src/main/java/com/wallee/sdk/service/CustomerService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/DebtCollectionCaseService.java b/src/main/java/com/wallee/sdk/service/DebtCollectionCaseService.java index 2baf3ea6..c9231623 100644 --- a/src/main/java/com/wallee/sdk/service/DebtCollectionCaseService.java +++ b/src/main/java/com/wallee/sdk/service/DebtCollectionCaseService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import java.math.BigDecimal; diff --git a/src/main/java/com/wallee/sdk/service/DebtCollectorConfigurationService.java b/src/main/java/com/wallee/sdk/service/DebtCollectorConfigurationService.java index 3b118fd7..45af1a99 100644 --- a/src/main/java/com/wallee/sdk/service/DebtCollectorConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/DebtCollectorConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/DebtCollectorService.java b/src/main/java/com/wallee/sdk/service/DebtCollectorService.java index 93b23335..83896acf 100644 --- a/src/main/java/com/wallee/sdk/service/DebtCollectorService.java +++ b/src/main/java/com/wallee/sdk/service/DebtCollectorService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/DeliveryIndicationService.java b/src/main/java/com/wallee/sdk/service/DeliveryIndicationService.java index 0eb22de5..1c4aeeff 100644 --- a/src/main/java/com/wallee/sdk/service/DeliveryIndicationService.java +++ b/src/main/java/com/wallee/sdk/service/DeliveryIndicationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/DocumentTemplateService.java b/src/main/java/com/wallee/sdk/service/DocumentTemplateService.java index 7d2b0640..bef5757c 100644 --- a/src/main/java/com/wallee/sdk/service/DocumentTemplateService.java +++ b/src/main/java/com/wallee/sdk/service/DocumentTemplateService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/DocumentTemplateTypeService.java b/src/main/java/com/wallee/sdk/service/DocumentTemplateTypeService.java index a66e9f16..aa115e7a 100644 --- a/src/main/java/com/wallee/sdk/service/DocumentTemplateTypeService.java +++ b/src/main/java/com/wallee/sdk/service/DocumentTemplateTypeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ExternalTransferBankTransactionService.java b/src/main/java/com/wallee/sdk/service/ExternalTransferBankTransactionService.java index adfa36ad..3fe26d78 100644 --- a/src/main/java/com/wallee/sdk/service/ExternalTransferBankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/ExternalTransferBankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/HumanUserService.java b/src/main/java/com/wallee/sdk/service/HumanUserService.java index 974f6e09..8edc8eb8 100644 --- a/src/main/java/com/wallee/sdk/service/HumanUserService.java +++ b/src/main/java/com/wallee/sdk/service/HumanUserService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InstallmentPaymentService.java b/src/main/java/com/wallee/sdk/service/InstallmentPaymentService.java index 87c1b766..5937ed13 100644 --- a/src/main/java/com/wallee/sdk/service/InstallmentPaymentService.java +++ b/src/main/java/com/wallee/sdk/service/InstallmentPaymentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InstallmentPaymentSliceService.java b/src/main/java/com/wallee/sdk/service/InstallmentPaymentSliceService.java index 0d5d7cb5..96dee1c9 100644 --- a/src/main/java/com/wallee/sdk/service/InstallmentPaymentSliceService.java +++ b/src/main/java/com/wallee/sdk/service/InstallmentPaymentSliceService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InstallmentPlanCalculationService.java b/src/main/java/com/wallee/sdk/service/InstallmentPlanCalculationService.java index ac2c5ca1..f74342d0 100644 --- a/src/main/java/com/wallee/sdk/service/InstallmentPlanCalculationService.java +++ b/src/main/java/com/wallee/sdk/service/InstallmentPlanCalculationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InstallmentPlanConfigurationService.java b/src/main/java/com/wallee/sdk/service/InstallmentPlanConfigurationService.java index cafd4a4d..589eb254 100644 --- a/src/main/java/com/wallee/sdk/service/InstallmentPlanConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/InstallmentPlanConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InstallmentPlanSliceConfigurationService.java b/src/main/java/com/wallee/sdk/service/InstallmentPlanSliceConfigurationService.java index 4bd807fb..08a30658 100644 --- a/src/main/java/com/wallee/sdk/service/InstallmentPlanSliceConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/InstallmentPlanSliceConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InternalTransferBankTransactionService.java b/src/main/java/com/wallee/sdk/service/InternalTransferBankTransactionService.java index ecbde6e5..a888396d 100644 --- a/src/main/java/com/wallee/sdk/service/InternalTransferBankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/InternalTransferBankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordInvoiceLinkService.java b/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordInvoiceLinkService.java index 72b46b40..51d0deb1 100644 --- a/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordInvoiceLinkService.java +++ b/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordInvoiceLinkService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import java.math.BigDecimal; diff --git a/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordService.java b/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordService.java index 1cb09311..a4258c8a 100644 --- a/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordService.java +++ b/src/main/java/com/wallee/sdk/service/InvoiceReconciliationRecordService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/InvoiceReimbursementService.java b/src/main/java/com/wallee/sdk/service/InvoiceReimbursementService.java index 5f1d6b7b..372b27a9 100644 --- a/src/main/java/com/wallee/sdk/service/InvoiceReimbursementService.java +++ b/src/main/java/com/wallee/sdk/service/InvoiceReimbursementService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/LabelDescriptionGroupService.java b/src/main/java/com/wallee/sdk/service/LabelDescriptionGroupService.java index dcce6709..94c0b33f 100644 --- a/src/main/java/com/wallee/sdk/service/LabelDescriptionGroupService.java +++ b/src/main/java/com/wallee/sdk/service/LabelDescriptionGroupService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/LabelDescriptionService.java b/src/main/java/com/wallee/sdk/service/LabelDescriptionService.java index 16b79c33..281c1866 100644 --- a/src/main/java/com/wallee/sdk/service/LabelDescriptionService.java +++ b/src/main/java/com/wallee/sdk/service/LabelDescriptionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/LanguageService.java b/src/main/java/com/wallee/sdk/service/LanguageService.java index 92695815..bc4119a6 100644 --- a/src/main/java/com/wallee/sdk/service/LanguageService.java +++ b/src/main/java/com/wallee/sdk/service/LanguageService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/LegalOrganizationFormService.java b/src/main/java/com/wallee/sdk/service/LegalOrganizationFormService.java index 1be0c105..192b59f8 100644 --- a/src/main/java/com/wallee/sdk/service/LegalOrganizationFormService.java +++ b/src/main/java/com/wallee/sdk/service/LegalOrganizationFormService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ManualTaskService.java b/src/main/java/com/wallee/sdk/service/ManualTaskService.java index 8fd6d7f6..e11210d2 100644 --- a/src/main/java/com/wallee/sdk/service/ManualTaskService.java +++ b/src/main/java/com/wallee/sdk/service/ManualTaskService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/MerticUsageService.java b/src/main/java/com/wallee/sdk/service/MerticUsageService.java index d708ef38..b43cdc5b 100644 --- a/src/main/java/com/wallee/sdk/service/MerticUsageService.java +++ b/src/main/java/com/wallee/sdk/service/MerticUsageService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentConnectorConfigurationService.java b/src/main/java/com/wallee/sdk/service/PaymentConnectorConfigurationService.java index 844b9298..2aa1ff8b 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentConnectorConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentConnectorConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentConnectorService.java b/src/main/java/com/wallee/sdk/service/PaymentConnectorService.java index a8252126..07d2b927 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentConnectorService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentConnectorService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentLinkService.java b/src/main/java/com/wallee/sdk/service/PaymentLinkService.java index 83bb26db..18fb0f7c 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentLinkService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentLinkService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentMethodBrandService.java b/src/main/java/com/wallee/sdk/service/PaymentMethodBrandService.java index 52f08f94..af22afcb 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentMethodBrandService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentMethodBrandService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentMethodConfigurationService.java b/src/main/java/com/wallee/sdk/service/PaymentMethodConfigurationService.java index 301d04e6..5b8edeb0 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentMethodConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentMethodConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentMethodService.java b/src/main/java/com/wallee/sdk/service/PaymentMethodService.java index eb11fc7c..134e2beb 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentMethodService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentMethodService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentProcessorConfigurationService.java b/src/main/java/com/wallee/sdk/service/PaymentProcessorConfigurationService.java index 68af9d1a..355459bf 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentProcessorConfigurationService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentProcessorConfigurationService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentProcessorService.java b/src/main/java/com/wallee/sdk/service/PaymentProcessorService.java index 65fe90f4..9ae4e3ef 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentProcessorService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentProcessorService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentTerminalService.java b/src/main/java/com/wallee/sdk/service/PaymentTerminalService.java index ae5b5f55..55164499 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentTerminalService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentTerminalService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentTerminalTillService.java b/src/main/java/com/wallee/sdk/service/PaymentTerminalTillService.java index c1864c69..6b6e3e38 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentTerminalTillService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentTerminalTillService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentTerminalTransactionSummaryService.java b/src/main/java/com/wallee/sdk/service/PaymentTerminalTransactionSummaryService.java index 3548bae4..d59cfd16 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentTerminalTransactionSummaryService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentTerminalTransactionSummaryService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/PaymentWebAppService.java b/src/main/java/com/wallee/sdk/service/PaymentWebAppService.java index 151876f9..a873ae96 100644 --- a/src/main/java/com/wallee/sdk/service/PaymentWebAppService.java +++ b/src/main/java/com/wallee/sdk/service/PaymentWebAppService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ChargeAttempt; diff --git a/src/main/java/com/wallee/sdk/service/PermissionService.java b/src/main/java/com/wallee/sdk/service/PermissionService.java index 06aaf809..ce1605af 100644 --- a/src/main/java/com/wallee/sdk/service/PermissionService.java +++ b/src/main/java/com/wallee/sdk/service/PermissionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/RefundBankTransactionService.java b/src/main/java/com/wallee/sdk/service/RefundBankTransactionService.java index a19dc1d6..fc2c51d1 100644 --- a/src/main/java/com/wallee/sdk/service/RefundBankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/RefundBankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/RefundCommentService.java b/src/main/java/com/wallee/sdk/service/RefundCommentService.java index cdc7fab1..66e236d7 100644 --- a/src/main/java/com/wallee/sdk/service/RefundCommentService.java +++ b/src/main/java/com/wallee/sdk/service/RefundCommentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/RefundRecoveryBankTransactionService.java b/src/main/java/com/wallee/sdk/service/RefundRecoveryBankTransactionService.java index e0a879a8..01f852a9 100644 --- a/src/main/java/com/wallee/sdk/service/RefundRecoveryBankTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/RefundRecoveryBankTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/RefundService.java b/src/main/java/com/wallee/sdk/service/RefundService.java index 88359d1a..cefd12ee 100644 --- a/src/main/java/com/wallee/sdk/service/RefundService.java +++ b/src/main/java/com/wallee/sdk/service/RefundService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifyRecurringOrderService.java b/src/main/java/com/wallee/sdk/service/ShopifyRecurringOrderService.java index 1a5139bb..e161f266 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifyRecurringOrderService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifyRecurringOrderService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifySubscriberService.java b/src/main/java/com/wallee/sdk/service/ShopifySubscriberService.java index c2db877d..6a878c1f 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifySubscriberService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifySubscriberService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionProductService.java b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionProductService.java index 7ee4539e..8aec6caa 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionProductService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionProductService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionService.java b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionService.java index e6e6c02f..cb1d99ae 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionSuspensionService.java b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionSuspensionService.java index e6e40fa8..bb38a8e4 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionSuspensionService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionSuspensionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionVersionService.java b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionVersionService.java index 42909430..7e5b4017 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifySubscriptionVersionService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifySubscriptionVersionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/ShopifyTransactionService.java b/src/main/java/com/wallee/sdk/service/ShopifyTransactionService.java index bad5ccfa..a45eab9a 100644 --- a/src/main/java/com/wallee/sdk/service/ShopifyTransactionService.java +++ b/src/main/java/com/wallee/sdk/service/ShopifyTransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SpaceService.java b/src/main/java/com/wallee/sdk/service/SpaceService.java index 4c4014ed..692fe6dd 100644 --- a/src/main/java/com/wallee/sdk/service/SpaceService.java +++ b/src/main/java/com/wallee/sdk/service/SpaceService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/StaticValueService.java b/src/main/java/com/wallee/sdk/service/StaticValueService.java index 42b2e269..3b7cc19b 100644 --- a/src/main/java/com/wallee/sdk/service/StaticValueService.java +++ b/src/main/java/com/wallee/sdk/service/StaticValueService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriberService.java b/src/main/java/com/wallee/sdk/service/SubscriberService.java index 03f55624..c4ada1c3 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriberService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriberService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionAffiliateService.java b/src/main/java/com/wallee/sdk/service/SubscriptionAffiliateService.java index 84284b10..78d51196 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionAffiliateService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionAffiliateService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionChargeService.java b/src/main/java/com/wallee/sdk/service/SubscriptionChargeService.java index c33607dc..391926ef 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionChargeService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionChargeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionLedgerEntryService.java b/src/main/java/com/wallee/sdk/service/SubscriptionLedgerEntryService.java index 957489fd..a7c1d6ed 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionLedgerEntryService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionLedgerEntryService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionMetricService.java b/src/main/java/com/wallee/sdk/service/SubscriptionMetricService.java index 6de8e72d..9f924c7c 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionMetricService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionMetricService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionMetricUsageService.java b/src/main/java/com/wallee/sdk/service/SubscriptionMetricUsageService.java index 2808eb29..ced17f5c 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionMetricUsageService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionMetricUsageService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionPeriodBillService.java b/src/main/java/com/wallee/sdk/service/SubscriptionPeriodBillService.java index c8ed6fe1..3b18cfaf 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionPeriodBillService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionPeriodBillService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentGroupService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentGroupService.java index c7f06e11..e42d5e07 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentGroupService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentGroupService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentService.java index 0307d938..2f04e7e8 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductComponentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductFeeTierService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductFeeTierService.java index 734414cd..9a8cca10 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductFeeTierService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductFeeTierService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductMeteredFeeService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductMeteredFeeService.java index ba036211..9d63abf7 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductMeteredFeeService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductMeteredFeeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductPeriodFeeService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductPeriodFeeService.java index 9d82b8b8..c0943e51 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductPeriodFeeService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductPeriodFeeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductRetirementService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductRetirementService.java index 75f08bb1..c0723276 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductRetirementService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductRetirementService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductService.java index aaa5d9b3..a15826eb 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductSetupFeeService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductSetupFeeService.java index 49c87136..6c992263 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductSetupFeeService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductSetupFeeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionRetirementService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionRetirementService.java index 339f4395..fdbc8fff 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionRetirementService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionRetirementService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionService.java b/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionService.java index 3b5ba7ab..10601bc6 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionProductVersionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionService.java b/src/main/java/com/wallee/sdk/service/SubscriptionService.java index 87d0fce5..53d64f22 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionSuspensionService.java b/src/main/java/com/wallee/sdk/service/SubscriptionSuspensionService.java index be3febc7..2dab228f 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionSuspensionService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionSuspensionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/SubscriptionVersionService.java b/src/main/java/com/wallee/sdk/service/SubscriptionVersionService.java index e5a92d3e..868eccfa 100644 --- a/src/main/java/com/wallee/sdk/service/SubscriptionVersionService.java +++ b/src/main/java/com/wallee/sdk/service/SubscriptionVersionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TokenService.java b/src/main/java/com/wallee/sdk/service/TokenService.java index f39775a4..2a6e8e9a 100644 --- a/src/main/java/com/wallee/sdk/service/TokenService.java +++ b/src/main/java/com/wallee/sdk/service/TokenService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.Charge; diff --git a/src/main/java/com/wallee/sdk/service/TokenVersionService.java b/src/main/java/com/wallee/sdk/service/TokenVersionService.java index d4c593c4..735ca272 100644 --- a/src/main/java/com/wallee/sdk/service/TokenVersionService.java +++ b/src/main/java/com/wallee/sdk/service/TokenVersionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionCommentService.java b/src/main/java/com/wallee/sdk/service/TransactionCommentService.java index 00571a55..319549e3 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionCommentService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionCommentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionCompletionService.java b/src/main/java/com/wallee/sdk/service/TransactionCompletionService.java index 674a9560..5b54efa0 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionCompletionService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionCompletionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionIframeService.java b/src/main/java/com/wallee/sdk/service/TransactionIframeService.java index 0658b37c..ad21a122 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionIframeService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionIframeService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionInvoiceCommentService.java b/src/main/java/com/wallee/sdk/service/TransactionInvoiceCommentService.java index aa5a9c8e..8f2ed770 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionInvoiceCommentService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionInvoiceCommentService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionInvoiceService.java b/src/main/java/com/wallee/sdk/service/TransactionInvoiceService.java index abc1a928..c837e894 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionInvoiceService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionInvoiceService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionLightboxService.java b/src/main/java/com/wallee/sdk/service/TransactionLightboxService.java index d8f15f88..6dc05716 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionLightboxService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionLightboxService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionLineItemVersionService.java b/src/main/java/com/wallee/sdk/service/TransactionLineItemVersionService.java index d6738c4c..88bd6b19 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionLineItemVersionService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionLineItemVersionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionMobileSdkService.java b/src/main/java/com/wallee/sdk/service/TransactionMobileSdkService.java index 7028a381..511e7917 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionMobileSdkService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionMobileSdkService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionPaymentPageService.java b/src/main/java/com/wallee/sdk/service/TransactionPaymentPageService.java index ef866e80..d35a810f 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionPaymentPageService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionPaymentPageService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionService.java b/src/main/java/com/wallee/sdk/service/TransactionService.java index 85a10fe0..cbdf6952 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionTerminalService.java b/src/main/java/com/wallee/sdk/service/TransactionTerminalService.java index 75e5ead7..7dac9429 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionTerminalService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionTerminalService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/TransactionVoidService.java b/src/main/java/com/wallee/sdk/service/TransactionVoidService.java index 757c539c..71bd7e39 100644 --- a/src/main/java/com/wallee/sdk/service/TransactionVoidService.java +++ b/src/main/java/com/wallee/sdk/service/TransactionVoidService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/UserAccountRoleService.java b/src/main/java/com/wallee/sdk/service/UserAccountRoleService.java index f326e443..39af1786 100644 --- a/src/main/java/com/wallee/sdk/service/UserAccountRoleService.java +++ b/src/main/java/com/wallee/sdk/service/UserAccountRoleService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/UserSpaceRoleService.java b/src/main/java/com/wallee/sdk/service/UserSpaceRoleService.java index b8600192..7b29c7ce 100644 --- a/src/main/java/com/wallee/sdk/service/UserSpaceRoleService.java +++ b/src/main/java/com/wallee/sdk/service/UserSpaceRoleService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/WebAppService.java b/src/main/java/com/wallee/sdk/service/WebAppService.java index 5a41f1ba..cc640336 100644 --- a/src/main/java/com/wallee/sdk/service/WebAppService.java +++ b/src/main/java/com/wallee/sdk/service/WebAppService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/WebhookEncryptionService.java b/src/main/java/com/wallee/sdk/service/WebhookEncryptionService.java index 2858531d..c3723870 100644 --- a/src/main/java/com/wallee/sdk/service/WebhookEncryptionService.java +++ b/src/main/java/com/wallee/sdk/service/WebhookEncryptionService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; @@ -28,7 +28,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import com.wallee.sdk.EncryptionUtil; +import com.wallee.sdk.util.EncryptionUtil; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.security.Security; diff --git a/src/main/java/com/wallee/sdk/service/WebhookListenerService.java b/src/main/java/com/wallee/sdk/service/WebhookListenerService.java index 0bf0aab4..10f60a25 100644 --- a/src/main/java/com/wallee/sdk/service/WebhookListenerService.java +++ b/src/main/java/com/wallee/sdk/service/WebhookListenerService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/service/WebhookUrlService.java b/src/main/java/com/wallee/sdk/service/WebhookUrlService.java index f21a610f..913d2d5c 100644 --- a/src/main/java/com/wallee/sdk/service/WebhookUrlService.java +++ b/src/main/java/com/wallee/sdk/service/WebhookUrlService.java @@ -4,8 +4,8 @@ import com.wallee.sdk.ApiClient; import com.wallee.sdk.ErrorCode; -import com.wallee.sdk.WalleeSdkException; -import com.wallee.sdk.URIBuilderUtil; +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.URIBuilderUtil; import com.wallee.sdk.StringUtil; import com.wallee.sdk.model.ClientError; diff --git a/src/main/java/com/wallee/sdk/EncryptionUtil.java b/src/main/java/com/wallee/sdk/util/EncryptionUtil.java similarity index 97% rename from src/main/java/com/wallee/sdk/EncryptionUtil.java rename to src/main/java/com/wallee/sdk/util/EncryptionUtil.java index 45ac93c3..d90ea74a 100644 --- a/src/main/java/com/wallee/sdk/EncryptionUtil.java +++ b/src/main/java/com/wallee/sdk/util/EncryptionUtil.java @@ -17,7 +17,10 @@ */ -package com.wallee.sdk; +package com.wallee.sdk.util; + +import com.wallee.sdk.ErrorCode; +import com.wallee.sdk.exception.WalleeSdkException; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; @@ -71,7 +74,6 @@ public static boolean isContentValid(String contentToVerify, String contentSigna } catch (SignatureException e) { throw new WalleeSdkException(ErrorCode.WEBHOOK_ENCRYPTION_GENERAL_ERROR, "Could not verify content due to unknown issue: " + e.getLocalizedMessage()); - } } diff --git a/src/main/java/com/wallee/sdk/URIBuilderUtil.java b/src/main/java/com/wallee/sdk/util/URIBuilderUtil.java similarity index 99% rename from src/main/java/com/wallee/sdk/URIBuilderUtil.java rename to src/main/java/com/wallee/sdk/util/URIBuilderUtil.java index 61d276ba..4092aa8b 100644 --- a/src/main/java/com/wallee/sdk/URIBuilderUtil.java +++ b/src/main/java/com/wallee/sdk/util/URIBuilderUtil.java @@ -17,7 +17,7 @@ */ -package com.wallee.sdk; +package com.wallee.sdk.util; import com.google.api.client.http.UriTemplate; import java.net.URI; diff --git a/src/test/java/com/wallee/sdk/test/EncryptionUtilTest.java b/src/test/java/com/wallee/sdk/test/EncryptionUtilTest.java new file mode 100644 index 00000000..012aa7cc --- /dev/null +++ b/src/test/java/com/wallee/sdk/test/EncryptionUtilTest.java @@ -0,0 +1,125 @@ +package com.wallee.sdk.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +import com.wallee.sdk.exception.WalleeSdkException; +import com.wallee.sdk.util.EncryptionUtil; +import com.wallee.sdk.model.WebhookEncryptionPublicKey; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.security.Security; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.junit.BeforeClass; +import org.junit.Test; + +public class EncryptionUtilTest { + private static final String SIGNATURE_ALGORITHM = "SHA256withECDSA"; + + private static final String VALID_CONTENT_TO_VERIFY = + "{\"entityId\":11,\"eventId\":35,\"listenerEntityId\":1472041829003,\"listenerEntityTechnicalName\":\"Transaction\",\"spaceId\":1,\"state\":\"PROCESSING\",\"timestamp\":\"2023-12-19T13:43:35+0000\",\"webhookListenerId\":2}"; + + private static final String VALID_CONTENT_SIGNATURE = + "MEYCIQCTzbMrMsOAC6T57T9kQTb1iGZVg2R7n6pY9A4ML4P31gIhAIOoav8cG8x0jpRWQztqSJIC8gXWKq+4DuENEySvmMYf"; + + private static final String VALID_ENCODED_PUBLIC_KEY = + "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdWq7ZBGsjUzhBO3e6mzUBLpjpV3TQw1bL1rk3ocjn5C5qne7TY0OBBhiWgaPtWlvUcqASz903vtfeSTQma+SBA=="; + + private static WebhookEncryptionPublicKey VALID_PUBLIC_KEY; + + @BeforeClass + public static void init() { + setupSecurityProvider(); + setupValidPublicKeyAsApiObject(); + } + + @Test + public void validationShouldPassForValidContentSignatureAndKey() { + boolean validationResult = EncryptionUtil.isContentValid( + VALID_CONTENT_TO_VERIFY, VALID_CONTENT_SIGNATURE, VALID_PUBLIC_KEY, + BouncyCastleProvider.PROVIDER_NAME, SIGNATURE_ALGORITHM); + + assertTrue("Valid public key, signature and content must fit each other", validationResult); + } + + @Test + public void validationShouldFailForBadContent() { + boolean validationResult = EncryptionUtil.isContentValid( + "ModifiedContent", VALID_CONTENT_SIGNATURE, VALID_PUBLIC_KEY, + BouncyCastleProvider.PROVIDER_NAME, SIGNATURE_ALGORITHM); + + assertFalse("Invalid content should fail validation", validationResult); + } + + @Test + public void validationShouldFailForBadSignatureFormat() { + assertThrows("Invalid signature should fail validation", + WalleeSdkException.class, () -> { + EncryptionUtil.isContentValid( + VALID_CONTENT_TO_VERIFY, "InvalidModifiedSignature", VALID_PUBLIC_KEY, + BouncyCastleProvider.PROVIDER_NAME, SIGNATURE_ALGORITHM); + }); + } + + @Test + public void validationShouldFailForBadSignatureBase64Format() { + assertThrows("Invalid signature should fail validation", + WalleeSdkException.class, () -> { + EncryptionUtil.isContentValid( + VALID_CONTENT_TO_VERIFY, + "MEYCIQCTzbMrMsOAC6T57T9kQTb1iGZVg2R7n6pY9A4ML4P31gIhAIOoav8cG8x0jpRWQztqSJIC8gXWKq", + VALID_PUBLIC_KEY, BouncyCastleProvider.PROVIDER_NAME, SIGNATURE_ALGORITHM); + }); + } + + @Test + public void validationShouldFailForBadPublicKeyFormat() { + assertThrows("Invalid public key should fail validation", + WalleeSdkException.class, () -> { + EncryptionUtil.isContentValid( + VALID_CONTENT_TO_VERIFY, VALID_CONTENT_SIGNATURE, + getPublicKeyAsApiObject("InvalidModifiedPublicKey"), + BouncyCastleProvider.PROVIDER_NAME, + SIGNATURE_ALGORITHM); + }); + } + + @Test + public void validationShouldFailForBadPublicKeyBase64Format() { + assertThrows("Invalid public key should fail validation", + IllegalArgumentException.class, () -> { + EncryptionUtil.isContentValid( + VALID_CONTENT_TO_VERIFY, VALID_CONTENT_SIGNATURE, + getPublicKeyAsApiObject( + "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdWq7ZBGsjUzhBO3e6mzUBLpjpV3TQw1bL1rk3ocjn5C5qne7TY0OBBhiWgaPtWlvUcqASz903vtfeSTQm"), + BouncyCastleProvider.PROVIDER_NAME, SIGNATURE_ALGORITHM); + }); + } + + private static void setupValidPublicKeyAsApiObject() { + VALID_PUBLIC_KEY = getPublicKeyAsApiObject(VALID_ENCODED_PUBLIC_KEY); + } + + /** + * Imitate we got key object via API call. + */ + private static WebhookEncryptionPublicKey getPublicKeyAsApiObject(String key) { + String json = "{\n" + + " \"id\": \"123456890\",\n" + + " \"publicKey\": \"" + key + "\"\n" + + "}"; + + ObjectMapper objectMapper = new ObjectMapper(); + try { + return objectMapper.readValue(json, WebhookEncryptionPublicKey.class); + } catch (JsonProcessingException ex) { + throw new RuntimeException(ex); + } + } + + private static void setupSecurityProvider() { + Security.addProvider(new BouncyCastleProvider()); + } +} diff --git a/src/test/java/com/wallee/sdk/test/RefundServiceTest.java b/src/test/java/com/wallee/sdk/test/RefundServiceTest.java deleted file mode 100644 index a22a96dd..00000000 --- a/src/test/java/com/wallee/sdk/test/RefundServiceTest.java +++ /dev/null @@ -1,217 +0,0 @@ -package com.wallee.sdk.test; - -import com.wallee.sdk.ApiClient; -import com.wallee.sdk.model.*; -import com.wallee.sdk.service.*; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import java.math.BigDecimal; - -/** - * API tests for RefundService - */ -public class RefundServiceTest { - - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); - - // Customer Billing Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress("test@example.com") - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); - - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.addLineItemsItem(lineItem); - } - return this.transactionPayload; - } - - /** - * Get refund payload - * - * @param transaction - * @return - */ - private RefundCreate getRefundPayload(Transaction transaction) { - RefundCreate refundPayload = new RefundCreate(); - refundPayload.amount(transaction.getAuthorizationAmount()) - .transaction(transaction.getId()) - .merchantReference(transaction.getMerchantReference()) - .externalId(transaction.getId().toString()) - .type(RefundType.MERCHANT_INITIATED_ONLINE); - return refundPayload; - } - - - /** - * Count - *

- * Counts the number of items in the database as restricted by the given filter. - */ - @Ignore - @Test - public void countTest() { - // TODO: test validations - } - - /** - * fail - *

- * This operation allows to mark a refund as failed which is in state MANUAL_CHECK. - */ - @Ignore - @Test - public void failTest() { - // TODO: test validations - } - - /** - * getRefundDocument - *

- * Returns the PDF document for the refund with given id. - */ - @Ignore - @Test - public void getRefundDocumentTest() { - // TODO: test validations - } - - /** - * getRefundDocumentWithTargetMediaType - *

- * Returns the PDF document for the refund with given id and the given target media type. - */ - @Ignore - @Test - public void getRefundDocumentWithTargetMediaTypeTest() { - // TODO: test validations - } - - /** - * Read - *

- * Reads the entity with the given 'id' and returns it. - */ - @Ignore - @Test - public void readTest() { - // TODO: test validations - } - - /** - * create - *

- * This operation creates and executes a refund of a particular transaction. - */ - @Test - public void refundTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId()); - // wait for transaction to be authorized - for (int i = 1; i <= 10; i++) { - if ( - transaction.getState() == TransactionState.FULFILL || - transaction.getState() == TransactionState.FAILED - ) { - break; - } - - try { - Thread.sleep(i * 500); - } catch (InterruptedException e) { - System.err.println(e.getMessage()); - } - transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId()); - } - - if (transaction.getState() == TransactionState.FULFILL) { - TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId()); - - Assert.assertEquals( - "Transaction completion successful", - transactionCompletion.getState(), - TransactionCompletionState.SUCCESSFUL - ); - - transaction = this.apiClient.getTransactionService().read(transaction.getLinkedSpaceId(), transactionCompletion.getLinkedTransaction()); - Refund refund = this.apiClient.getRefundService().refund(this.spaceId, getRefundPayload(transaction)); - - Assert.assertEquals( - "Refund successful", - refund.getState(), - RefundState.SUCCESSFUL - ); - } else { - System.err.println("API response timeout"); - } - } - - /** - * Search - *

- * Searches for the entities as specified by the given query. - */ - @Ignore - @Test - public void searchTest() { - // TODO: test validations - } - - /** - * succeed - *

- * This operation allows to mark a refund as successful which is in state MANUAL_CHECK. - */ - @Ignore - @Test - public void succeedTest() { - // TODO: test validations - } - -} diff --git a/src/test/java/com/wallee/sdk/test/RefundTest.java b/src/test/java/com/wallee/sdk/test/RefundTest.java new file mode 100644 index 00000000..ee6f51f6 --- /dev/null +++ b/src/test/java/com/wallee/sdk/test/RefundTest.java @@ -0,0 +1,166 @@ +package com.wallee.sdk.test; + + +import static com.wallee.sdk.test.TestConstants.FAKE_CARD_DATA; +import static com.wallee.sdk.test.TestConstants.SPACE_ID; +import static com.wallee.sdk.test.TestConstants.TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static junit.framework.TestCase.assertFalse; +import static org.junit.Assert.assertEquals; + +import com.wallee.sdk.ApiClient; +import com.wallee.sdk.model.*; +import com.wallee.sdk.service.*; + +import java.io.IOException; +import java.util.List; +import org.junit.Before; +import org.junit.Test; + +public class RefundTest { + private TransactionService transactionService; + private CardProcessingService cardProcessingService; + private TransactionCompletionService transactionCompletionService; + private RefundService refundService; + + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); + + transactionService = apiClient.getTransactionService(); + cardProcessingService = apiClient.getCardProcessingService(); + transactionCompletionService = apiClient.getTransactionCompletionService(); + refundService = apiClient.getRefundService(); + } + + @Test + public void refundOfCompletedTransactionShouldWork() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + TestUtils.getTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + TransactionCompletion completedTransaction = + transactionCompletionService.completeOffline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction.getState()); + + Transaction readTransaction = transactionService.read(SPACE_ID, processedTransaction.getId()); + + Refund refund = refundService.refund(SPACE_ID, getRefundCreatePayload(readTransaction)); + assertEquals("State must be SUCCESSFUL", + RefundState.SUCCESSFUL, refund.getState()); + } + + @Test + public void readShouldReturnRefundData() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + TestUtils.getTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + TransactionCompletion completedTransaction = + transactionCompletionService.completeOffline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction.getState()); + + Transaction readTransaction = transactionService.read(SPACE_ID, processedTransaction.getId()); + + Refund refund = refundService.refund(SPACE_ID, getRefundCreatePayload(readTransaction)); + assertEquals("State must be SUCCESSFUL", + RefundState.SUCCESSFUL, refund.getState()); + + Refund readRefund = refundService.read(SPACE_ID, refund.getId()); + + assertEquals("Refund ids must match", + refund.getId(), readRefund.getId()); + } + + @Test + public void searchByGivenCriteriaShouldReturnRefund() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + TestUtils.getTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + TransactionCompletion completedTransaction = + transactionCompletionService.completeOffline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction.getState()); + + Transaction readTransaction = transactionService.read(SPACE_ID, processedTransaction.getId()); + + Refund refund = refundService.refund(SPACE_ID, getRefundCreatePayload(readTransaction)); + assertEquals("State must be SUCCESSFUL", + RefundState.SUCCESSFUL, refund.getState()); + + EntityQueryFilter filter = new EntityQueryFilter(); + filter.setFieldName("id"); + filter.setValue(refund.getId()); + filter.setType(EntityQueryFilterType.LEAF); + filter.setOperator(CriteriaOperator.EQUALS); + + EntityQuery criteria = new EntityQuery(); + criteria.setFilter(filter); + + List refunds = refundService.search(SPACE_ID, criteria); + + assertEquals("Should find 1 refund", 1, refunds.size()); + + refunds.forEach(ref -> { + assertEquals("Refund ids must match", + refund.getId(), ref.getId()); + }); + } + + @Test + public void countByGivenCriteriaShouldReturnAmountOfRefunds() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + TestUtils.getTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + TransactionCompletion completedTransaction = + transactionCompletionService.completeOffline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction.getState()); + + Transaction readTransaction = transactionService.read(SPACE_ID, processedTransaction.getId()); + + Refund refund = refundService.refund(SPACE_ID, getRefundCreatePayload(readTransaction)); + assertEquals("State must be SUCCESSFUL", + RefundState.SUCCESSFUL, refund.getState()); + + EntityQueryFilter criteria = new EntityQueryFilter(); + criteria.setFieldName("id"); + criteria.setValue(refund.getId()); + criteria.setType(EntityQueryFilterType.LEAF); + criteria.setOperator(CriteriaOperator.EQUALS); + + long count = refundService.count(SPACE_ID, criteria); + assertEquals(1, count); + } + + private RefundCreate getRefundCreatePayload(Transaction transaction) { + RefundCreate create = new RefundCreate(); + create.setExternalId(String.valueOf(transaction.getId())); + create.setType(RefundType.MERCHANT_INITIATED_ONLINE); + create.setAmount(transaction.getAuthorizationAmount()); + create.setTransaction(transaction.getId()); + create.setMerchantReference(transaction.getMerchantReference()); + + return create; + } +} diff --git a/src/test/java/com/wallee/sdk/test/TestConstants.java b/src/test/java/com/wallee/sdk/test/TestConstants.java new file mode 100644 index 00000000..7c8006b6 --- /dev/null +++ b/src/test/java/com/wallee/sdk/test/TestConstants.java @@ -0,0 +1,23 @@ +package com.wallee.sdk.test; + +import com.wallee.sdk.model.AuthenticatedCardDataCreate; + +public abstract class TestConstants { + public static final long APPLICATION_USER_ID = 512; + public static final String AUTHENTICATION_KEY = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; + + public static final long SPACE_ID = 405; + public static final long TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID = 1352; + public static final long TEST_CUSTOMER_ID = 7311742; + + public static final AuthenticatedCardDataCreate FAKE_CARD_DATA; + + static { + FAKE_CARD_DATA = new AuthenticatedCardDataCreate(); + FAKE_CARD_DATA.setPrimaryAccountNumber("4111111111111111"); + FAKE_CARD_DATA.setExpiryDate("2026-12"); + } + + private TestConstants() { + } +} diff --git a/src/test/java/com/wallee/sdk/test/TestUtils.java b/src/test/java/com/wallee/sdk/test/TestUtils.java new file mode 100644 index 00000000..c0af6294 --- /dev/null +++ b/src/test/java/com/wallee/sdk/test/TestUtils.java @@ -0,0 +1,53 @@ +package com.wallee.sdk.test; + +import com.wallee.sdk.ApiClient; +import com.wallee.sdk.model.*; +import java.math.BigDecimal; + +public abstract class TestUtils { + private TestUtils() { + } + + public static ApiClient getApiClient() { + ApiClient client = + new ApiClient(TestConstants.APPLICATION_USER_ID, TestConstants.AUTHENTICATION_KEY); + client.setReadTimeOut(60); + return client; + } + + public static TransactionCreate getTransactionCreatePayload() { + LineItemCreate lineItem = new LineItemCreate(); + lineItem.name("Red T-Shirt") + .uniqueId("5412") + .type(LineItemType.PRODUCT) + .quantity(BigDecimal.valueOf(1)) + .amountIncludingTax(BigDecimal.valueOf(29.95)) + .sku("red-t-shirt-789"); + + String email = "test@customweb.com"; + + AddressCreate address = new AddressCreate(); + address.city("Winterthur") + .country("CH") + .emailAddress(email) + .familyName("Customer") + .givenName("Good") + .postcode("8400") + .postalState("ZH") + .organizationName("Test GmbH") + .mobilePhoneNumber("+41791234567") + .salutation("Ms"); + + TransactionCreate create = new TransactionCreate(); + create.autoConfirmationEnabled(true); + create.currency("CHF"); + create.language("en-US"); + create.addLineItemsItem(lineItem); + create.setCustomerId("1234"); + create.setCustomerEmailAddress(email); + create.setBillingAddress(address); + create.setShippingAddress(address); + + return create; + } +} diff --git a/src/test/java/com/wallee/sdk/test/TransactionCompletionServiceTest.java b/src/test/java/com/wallee/sdk/test/TransactionCompletionServiceTest.java index d34f24b2..4e52eb59 100644 --- a/src/test/java/com/wallee/sdk/test/TransactionCompletionServiceTest.java +++ b/src/test/java/com/wallee/sdk/test/TransactionCompletionServiceTest.java @@ -1,211 +1,163 @@ package com.wallee.sdk.test; +import static com.wallee.sdk.test.TestConstants.FAKE_CARD_DATA; +import static com.wallee.sdk.test.TestConstants.SPACE_ID; +import static com.wallee.sdk.test.TestConstants.TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static com.wallee.sdk.test.TestUtils.getTransactionCreatePayload; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import com.wallee.sdk.ApiClient; import com.wallee.sdk.model.*; import com.wallee.sdk.service.*; -import org.junit.Assert; +import java.io.IOException; +import java.util.List; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import java.math.BigDecimal; -import java.util.Arrays; - -/** - * API tests for TransactionCompletionService - */ public class TransactionCompletionServiceTest { + private TransactionService transactionService; + private CardProcessingService cardProcessingService; + private TransactionCompletionService transactionCompletionService; + + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); + + transactionService = apiClient.getTransactionService(); + cardProcessingService = apiClient.getCardProcessingService(); + transactionCompletionService = apiClient.getTransactionCompletionService(); + } + + @Test + public void completeOfflineShouldMakeTransactionStatusSuccessful() throws IOException { + Transaction transaction = + transactionService.create(SPACE_ID, getDeferredTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + + TransactionCompletion transactionCompletion = + transactionCompletionService.completeOffline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, transactionCompletion.getState()); + } + + @Test + public void completeOnlineShouldMakeTransactionStatusSuccessful() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + getDeferredTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + + TransactionCompletion transactionCompletion = + transactionCompletionService.completeOnline(SPACE_ID, processedTransaction.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, transactionCompletion.getState()); + } + + @Test + public void readShouldReturnCompletedTransactionData() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + getDeferredTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + + TransactionCompletion transactionCompletion = + transactionCompletionService.completeOnline(SPACE_ID, processedTransaction.getId()); + + TransactionCompletion readTransaction = + transactionCompletionService.read(SPACE_ID, transactionCompletion.getId()); + + assertEquals("Transaction ids must match", + transactionCompletion.getId(), readTransaction.getId()); + } + + @Test + public void countByCriteriaShouldReturnAmountOfCompletedTransactions() throws IOException { + Transaction transaction = + transactionService.create(SPACE_ID, getDeferredTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + + TransactionCompletion completedTransaction = + transactionCompletionService.completeOnline(SPACE_ID, processedTransaction.getId()); + + EntityQueryFilter criteria = new EntityQueryFilter(); + criteria.setFieldName("id"); + criteria.setValue(completedTransaction.getId()); + criteria.setType(EntityQueryFilterType.LEAF); + criteria.setOperator(CriteriaOperator.EQUALS); + + long count = transactionCompletionService.count(SPACE_ID, criteria); + + assertEquals("Count of completions should be 1", + 1, count); + } + + @Test + public void searchByCriteriaShouldReturnTransactionCompletions() throws IOException { + Transaction transaction = + transactionService.create(SPACE_ID, getDeferredTransactionCreatePayload()); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + + TransactionCompletion transactionCompletion = + transactionCompletionService.completeOnline(SPACE_ID, processedTransaction.getId()); + + EntityQueryFilter filter = new EntityQueryFilter(); + filter.setFieldName("id"); + filter.setValue(transactionCompletion.getId()); + filter.setType(EntityQueryFilterType.LEAF); + filter.setOperator(CriteriaOperator.EQUALS); + + EntityQuery criteria = new EntityQuery(); + criteria.setFilter(filter); + + List completions = + transactionCompletionService.search(SPACE_ID, criteria); + + assertFalse("Completions should exist", completions.isEmpty()); - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); - - // Customer Billind Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress("test@example.com") - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); - - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_DEFERRED); - this.transactionPayload.addLineItemsItem(lineItem); - } - return this.transactionPayload; - } - - /** - * completeOffline - *

- * This operation completes the transaction offline. The completion is not forwarded to the processor. This implies the processor does not do anything. This method is only here to fix manually the transaction state. - */ - @Test - public void completeOfflineTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId()); - // wait for transaction to be authorized - for (int i = 1; i <= 10; i++) { - if ( - transaction.getState() == TransactionState.AUTHORIZED || - transaction.getState() == TransactionState.FAILED - ) { - break; - } - - try { - Thread.sleep(i * 500); - } catch (InterruptedException e) { - System.err.println(e.getMessage()); - } - transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId()); - } - if (transaction.getState() == TransactionState.FULFILL) { - Assert.assertEquals(TransactionState.AUTHORIZED, transaction.getState()); - - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId()); - TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOffline(this.spaceId, transaction.getId()); - TransactionCompletionState[] TransactionCompletionStates = { - TransactionCompletionState.SUCCESSFUL, - TransactionCompletionState.PENDING - }; - Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState())); - } else { - System.err.println("API response timeout"); - } - } - - /** - * completeOnline - *

- * This operation completes the transaction online. The completion is forwarded to the processor. This implies that the processor may take some actions based on the completion. - */ - @Test - public void completeOnlineTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId()); - // wait for transaction to be authorized - for (int i = 1; i <= 10; i++) { - if ( - transaction.getState() == TransactionState.AUTHORIZED || - transaction.getState() == TransactionState.FAILED - ) { - break; - } - - try { - Thread.sleep(i * 500); - } catch (InterruptedException e) { - System.err.println(e.getMessage()); - } - transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId()); - } - if (transaction.getState() == TransactionState.FULFILL) { - Assert.assertEquals(TransactionState.AUTHORIZED, transaction.getState()); - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(this.spaceId, transaction.getId()); - TransactionCompletion transactionCompletion = this.apiClient.getTransactionCompletionService().completeOnline(this.spaceId, transaction.getId()); - TransactionCompletionState[] TransactionCompletionStates = { - TransactionCompletionState.SUCCESSFUL, - TransactionCompletionState.PENDING - }; - Assert.assertTrue("Transaction Completions " + transactionCompletion.getState(), Arrays.asList(TransactionCompletionStates).contains(transactionCompletion.getState())); - } else { - System.err.println("API response timeout"); - } - } - - /** - * completePartiallyOffline - *

- * This operation can be used to partially complete the transaction offline. The completion is not forwarded to the processor. This implies the processor does not do anything. This method is only here to fix manually the transaction state. - */ - @Ignore - @Test - public void completePartiallyOfflineTest() { - // TODO: test validations - } - - /** - * completePartiallyOnline - *

- * This operation can be used to partially complete the transaction online. The completion is forwarded to the processor. This implies that the processor may take some actions based on the completion. - */ - @Ignore - @Test - public void completePartiallyOnlineTest() { - // TODO: test validations - } - - /** - * Count - *

- * Counts the number of items in the database as restricted by the given filter. - */ - @Ignore - @Test - public void countTest() { - // TODO: test validations - } - - /** - * Read - *

- * Reads the entity with the given 'id' and returns it. - */ - @Ignore - @Test - public void readTest() { - // TODO: test validations - } - - /** - * Search - *

- * Searches for the entities as specified by the given query. - */ - @Ignore - @Test - public void searchTest() { - // TODO: test validations - } + completions.forEach(compl -> { + assertEquals("Completion id should match", + transactionCompletion.getId(), compl.getId()); + }); + } + private TransactionCreate getDeferredTransactionCreatePayload() { + TransactionCreate create = getTransactionCreatePayload(); + create.setTokenizationMode(TokenizationMode.FORCE_CREATION); + create.setCustomersPresence(CustomersPresence.NOT_PRESENT); + create.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_DEFERRED); + return create; + } } diff --git a/src/test/java/com/wallee/sdk/test/TransactionIframeServiceTest.java b/src/test/java/com/wallee/sdk/test/TransactionIframeServiceTest.java index d006979a..a417014f 100644 --- a/src/test/java/com/wallee/sdk/test/TransactionIframeServiceTest.java +++ b/src/test/java/com/wallee/sdk/test/TransactionIframeServiceTest.java @@ -1,86 +1,36 @@ package com.wallee.sdk.test; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static org.junit.Assert.assertTrue; + import com.wallee.sdk.ApiClient; import com.wallee.sdk.model.*; import com.wallee.sdk.service.*; -import org.junit.Assert; +import java.io.IOException; import org.junit.Before; import org.junit.Test; -import java.math.BigDecimal; - -/** - * API tests for TransactionIframeService - */ public class TransactionIframeServiceTest { + private TransactionService transactionService; + private TransactionIframeService transactionIframeService; - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); - // Customer Billind Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress("test@example.com") - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); + transactionService = apiClient.getTransactionService(); + transactionIframeService = apiClient.getTransactionIframeService(); + } - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.addLineItemsItem(lineItem); - } - return this.transactionPayload; - } + @Test + public void shouldCreateUrlForJavascriptUsage() throws IOException { + Transaction transaction = transactionService.create(TestConstants.SPACE_ID, + TestUtils.getTransactionCreatePayload()); - /** - * Build JavaScript URL - *

- * This operation creates the URL which can be used to embed the JavaScript for handling the iFrame checkout flow. - */ - @Test - public void javascriptUrlTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - String javascriptUrl = this.apiClient.getTransactionIframeService().javascriptUrl(spaceId, transaction.getId()); - Assert.assertTrue(javascriptUrl.contains("https://")); - } + String url = + transactionIframeService.javascriptUrl(TestConstants.SPACE_ID, transaction.getId()); + assertTrue("URL must have proper format", url.contains("securityToken")); + } } diff --git a/src/test/java/com/wallee/sdk/test/TransactionLightboxServiceTest.java b/src/test/java/com/wallee/sdk/test/TransactionLightboxServiceTest.java index fe1acb99..e92c5a9a 100644 --- a/src/test/java/com/wallee/sdk/test/TransactionLightboxServiceTest.java +++ b/src/test/java/com/wallee/sdk/test/TransactionLightboxServiceTest.java @@ -1,86 +1,36 @@ package com.wallee.sdk.test; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static org.junit.Assert.assertTrue; + import com.wallee.sdk.ApiClient; import com.wallee.sdk.model.*; import com.wallee.sdk.service.*; -import org.junit.Assert; +import java.io.IOException; import org.junit.Before; import org.junit.Test; -import java.math.BigDecimal; - -/** - * API tests for TransactionLightboxService - */ public class TransactionLightboxServiceTest { + private TransactionService transactionService; + private TransactionLightboxService transactionLightboxService; - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); - // Customer Billind Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress("test@example.com") - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); + transactionService = apiClient.getTransactionService(); + transactionLightboxService = apiClient.getTransactionLightboxService(); + } - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.addLineItemsItem(lineItem); - } - return this.transactionPayload; - } + @Test + public void shouldCreateUrlForJavascriptUsage() throws IOException { + Transaction transaction = transactionService.create(TestConstants.SPACE_ID, + TestUtils.getTransactionCreatePayload()); - /** - * Build JavaScript URL - *

- * This operation creates the URL which can be used to embed the JavaScript for handling the Lightbox checkout flow. - */ - @Test - public void javascriptUrlTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - String javascriptUrl = this.apiClient.getTransactionLightboxService().javascriptUrl(spaceId, transaction.getId()); - Assert.assertTrue(javascriptUrl.contains("https://")); - } + String url = + transactionLightboxService.javascriptUrl(TestConstants.SPACE_ID, transaction.getId()); + assertTrue("URL must have proper format", url.contains("securityToken")); + } } diff --git a/src/test/java/com/wallee/sdk/test/TransactionPaymentPageServiceTest.java b/src/test/java/com/wallee/sdk/test/TransactionPaymentPageServiceTest.java index fef53d31..cfbc96aa 100644 --- a/src/test/java/com/wallee/sdk/test/TransactionPaymentPageServiceTest.java +++ b/src/test/java/com/wallee/sdk/test/TransactionPaymentPageServiceTest.java @@ -1,87 +1,36 @@ package com.wallee.sdk.test; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static org.junit.Assert.assertTrue; + import com.wallee.sdk.ApiClient; import com.wallee.sdk.model.*; import com.wallee.sdk.service.*; -import org.junit.Assert; +import java.io.IOException; import org.junit.Before; import org.junit.Test; -import java.math.BigDecimal; - -/** - * API tests for TransactionPaymentPageService - */ public class TransactionPaymentPageServiceTest { + private TransactionService transactionService; + private TransactionPaymentPageService transactionPaymentPageService; - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); - // Customer Billind Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress("test@example.com") - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); + transactionService = apiClient.getTransactionService(); + transactionPaymentPageService = apiClient.getTransactionPaymentPageService(); + } - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.addLineItemsItem(lineItem); - } - return this.transactionPayload; - } + @Test + public void shouldCreateUrlForJavascriptUsage() throws IOException { + Transaction transaction = transactionService.create(TestConstants.SPACE_ID, + TestUtils.getTransactionCreatePayload()); - /** - * Build Payment Page URL - * - * This operation creates the URL to which the user should be redirected to when the payment page should be used. - * - */ - @Test - public void paymentPageUrlTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - String paymentPageUrl = this.apiClient.getTransactionPaymentPageService().paymentPageUrl(spaceId, transaction.getId()); - Assert.assertTrue(paymentPageUrl.contains("https://")); - } + String url = + transactionPaymentPageService.paymentPageUrl(TestConstants.SPACE_ID, transaction.getId()); + assertTrue("URL must have proper format", url.contains("securityToken")); + } } diff --git a/src/test/java/com/wallee/sdk/test/TransactionServiceTest.java b/src/test/java/com/wallee/sdk/test/TransactionServiceTest.java index be75b5c3..a80d9525 100644 --- a/src/test/java/com/wallee/sdk/test/TransactionServiceTest.java +++ b/src/test/java/com/wallee/sdk/test/TransactionServiceTest.java @@ -1,357 +1,303 @@ package com.wallee.sdk.test; +import static com.wallee.sdk.test.TestConstants.FAKE_CARD_DATA; +import static com.wallee.sdk.test.TestConstants.SPACE_ID; +import static com.wallee.sdk.test.TestConstants.TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID; +import static com.wallee.sdk.test.TestConstants.TEST_CUSTOMER_ID; +import static com.wallee.sdk.test.TestUtils.getApiClient; +import static com.wallee.sdk.test.TestUtils.getTransactionCreatePayload; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import com.wallee.sdk.ApiClient; import com.wallee.sdk.model.*; import com.wallee.sdk.service.*; -import org.junit.Assert; +import java.io.IOException; +import java.util.List; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; - -/** - * API tests for TransactionService - */ public class TransactionServiceTest { + private TransactionService transactionService; + private CardProcessingService cardProcessingService; + private TokenService tokenService; + private TransactionCompletionService transactionCompletionService; + + @Before + public void beforeEach() { + ApiClient apiClient = getApiClient(); + + transactionService = apiClient.getTransactionService(); + cardProcessingService = apiClient.getCardProcessingService(); + tokenService = apiClient.getTokenService(); + transactionCompletionService = apiClient.getTransactionCompletionService(); + } + + @Test + public void createShouldCreateTransactionInPendingState() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, + getTransactionCreatePayload()); + + assertEquals("State must be PENDING", + TransactionState.PENDING, transaction.getState()); + } + + @Test + public void confirmShouldMakeTransactionConfirmed() throws IOException { + Transaction transaction = transactionService.create(SPACE_ID, getTransactionCreatePayload()); + + TransactionPending update = new TransactionPending(); + update.setId(transaction.getId()); + update.setVersion(Long.valueOf(transaction.getVersion())); + Transaction confirmedTransaction = + transactionService.confirm(SPACE_ID, update); + + assertEquals("State must be CONFIRMED", + TransactionState.CONFIRMED, confirmedTransaction.getState()); + } + + @Test + public void deferredTransactionProcessingShouldMakeTransactionAuthorized() + throws IOException { + TransactionCreate transactionCreate = getTransactionCreatePayload(); + transactionCreate.setTokenizationMode(TokenizationMode.FORCE_CREATION); + transactionCreate.setCustomersPresence(CustomersPresence.NOT_PRESENT); + transactionCreate.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_DEFERRED); + + Transaction transaction = transactionService.create(SPACE_ID, transactionCreate); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, processedTransaction.getState()); + } + + @Test + public void completeImmediatelyTransactionShouldMakeTransactionFulfilled() + throws IOException { + TransactionCreate transactionCreate = getTransactionCreatePayload(); + transactionCreate.setTokenizationMode(TokenizationMode.FORCE_CREATION); + transactionCreate.setCustomersPresence(CustomersPresence.NOT_PRESENT); + transactionCreate.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_IMMEDIATELY); + + Transaction transaction = transactionService.create(SPACE_ID, transactionCreate); + + Transaction processedTransaction = + cardProcessingService.process(SPACE_ID, transaction.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + assertEquals("State must be FULFILL", + TransactionState.FULFILL, processedTransaction.getState()); + } + + @Test + public void countByGivenCriteriaShouldReturnTransactionCount() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + EntityQueryFilter criteria = new EntityQueryFilter(); + criteria.setFieldName("id"); + criteria.setValue(transaction.getId()); + criteria.setType(EntityQueryFilterType.LEAF); + criteria.setOperator(CriteriaOperator.EQUALS); + + long count = transactionService.count(SPACE_ID, criteria); + assertEquals("Transaction count should be 1", + 1, count); + } + + @Test + public void fetchPaymentMethodsShouldReturnAvailablePaymentMethods() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + List methods = + transactionService.fetchPaymentMethods(SPACE_ID, transaction.getId(), "payment_page"); + + assertFalse("Payment methods should be configured for a given transaction in test space", + methods.isEmpty()); + } + + @Test + public void createTransactionCredentialsShouldCreateTransactionToken() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + String creds = transactionService.createTransactionCredentials( + SPACE_ID, transaction.getId()); + + assertTrue("Transaction credentials token should have valid format", + creds.startsWith(String.valueOf(SPACE_ID))); + } + + @Test + public void readForExistingTransactionShouldReturnTransactionData() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + Transaction readTransaction = transactionService.read( + SPACE_ID, transaction.getId()); + + assertEquals("Transaction ids should match", + transaction.getId(), readTransaction.getId()); + } + + @Test + public void readWithCredentialsWithGivenBadCredentialsShouldFail() { + assertThrows("Bad token should error response", + IOException.class, () -> { + transactionService.readWithCredentials("invalid_token"); + }); + } + + @Test + public void readWithCredentialsShouldReturnTransactionData() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + String creds = transactionService.createTransactionCredentials( + SPACE_ID, transaction.getId()); + + Transaction readTransaction = transactionService.readWithCredentials(creds); + assertEquals("Transaction ids should match", + transaction.getId(), readTransaction.getId()); + } + + @Test + public void searchByGivenCriteriaShouldFindTransaction() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + EntityQueryFilter filter = new EntityQueryFilter(); + filter.setFieldName("id"); + filter.setValue(transaction.getId()); + filter.setType(EntityQueryFilterType.LEAF); + filter.setOperator(CriteriaOperator.EQUALS); + + EntityQuery entityQuery = new EntityQuery(); + entityQuery.setFilter(filter); + + List transactions = transactionService.search(SPACE_ID, entityQuery); + + assertEquals("Should find 1 transaction", 1, transactions.size()); + + transactions.forEach(trans -> { + assertEquals("Transaction ids should match", + transaction.getId(), trans.getId()); + }); + } + + @Test + public void updateShouldChangeTransactionData() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + TransactionPending update = new TransactionPending(); + update.setId(transaction.getId()); + update.setVersion(Long.valueOf(transaction.getVersion())); + update.setLanguage("en-GB"); + + Transaction updatedTransaction = transactionService.update(SPACE_ID, update); + assertEquals("en-GB", updatedTransaction.getLanguage()); + } + + @Test + public void processWithoutUserInteractionShouldProcessTransactionProperly() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + Transaction processedTransaction = transactionService.processWithoutUserInteraction( + SPACE_ID, transaction.getId()); + + assertEquals("Transaction ids mush match", + transaction.getId(), processedTransaction.getId()); + } + + @Test + public void fetchOneClickTokenShouldReturnNoTokensIfThoseWereNotCreatedYet() throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + String creds = transactionService.createTransactionCredentials( + SPACE_ID, transaction.getId()); + + List tokens = transactionService.fetchOneClickTokensWithCredentials(creds); + assertTrue("Should be no tokens yet", tokens.isEmpty()); + } + + @Test + public void fetchPaymentMethodsWithCredentialsShouldReturnDefinedPaymentMethods() + throws IOException { + Transaction transaction = transactionService.create( + SPACE_ID, getTransactionCreatePayload()); + + String creds = transactionService.createTransactionCredentials( + SPACE_ID, transaction.getId()); + + List methods = + transactionService.fetchPaymentMethodsWithCredentials(creds, "payment_page"); + + assertFalse("Should have some payment methods set up", methods.isEmpty()); + } + + @Test + public void processOneClickTokenAndRedirectWithCredentialsShouldReturnPaymentUrl() + throws IOException { + TransactionCreate transactionCreate1 = getTransactionCreatePayload(); + transactionCreate1.setTokenizationMode(TokenizationMode.FORCE_CREATION_WITH_ONE_CLICK_PAYMENT); + transactionCreate1.setCustomersPresence(CustomersPresence.NOT_PRESENT); + transactionCreate1.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_DEFERRED); + transactionCreate1.setCustomerId(String.valueOf(TEST_CUSTOMER_ID)); + + Transaction transaction1 = transactionService.create( + SPACE_ID, transactionCreate1); + + Transaction processedTransaction1 = + cardProcessingService.process(SPACE_ID, transaction1.getId(), + TEST_CARD_PAYMENT_METHOD_CONFIGURATION_ID, FAKE_CARD_DATA); + + Token token = tokenService.createToken(SPACE_ID, processedTransaction1.getId()); + TokenUpdate tokenUpdate = new TokenUpdate(); + tokenUpdate.setId(token.getId()); + tokenUpdate.setVersion(Long.valueOf(token.getVersion())); + tokenUpdate.enabledForOneClickPayment(true); + Token updatedToken = tokenService.update(SPACE_ID, tokenUpdate); + + TransactionCreate transactionCreate2 = getTransactionCreatePayload(); + transactionCreate2.setTokenizationMode(TokenizationMode.FORCE_CREATION_WITH_ONE_CLICK_PAYMENT); + transactionCreate2.setCustomersPresence(CustomersPresence.NOT_PRESENT); + transactionCreate2.setCompletionBehavior(TransactionCompletionBehavior.COMPLETE_DEFERRED); + transactionCreate2.setCustomerId(String.valueOf(TEST_CUSTOMER_ID)); + + Transaction transaction2 = transactionService.create(SPACE_ID, transactionCreate2); + String creds2 = transactionService.createTransactionCredentials(SPACE_ID, transaction2.getId()); + String paymentUrl2 = transactionService.processOneClickTokenAndRedirectWithCredentials(creds2, + updatedToken.getId()); + + assertTrue("URL must be of a proper format", paymentUrl2.contains("securityToken")); + + Transaction readTransaction2 = transactionService.read(SPACE_ID, transaction2.getId()); + + assertEquals("State must be AUTHORIZED", + TransactionState.AUTHORIZED, readTransaction2.getState()); + + TransactionCompletion completedTransaction2 = + transactionCompletionService.completeOnline(SPACE_ID, transaction2.getId()); + + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction2.getState()); + + TransactionCompletion completedTransaction1 = + transactionCompletionService.completeOnline(SPACE_ID, transaction1.getId()); - // Credentials - private Long spaceId = (long) 405; - private Long applicationUserId = (long) 512; - private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ="; - - // Services - private ApiClient apiClient; - - // Models - private TransactionCreate transactionPayload; - - @Before - public void setup() { - if (this.apiClient == null) { - this.apiClient = new ApiClient(applicationUserId, authenticationKey); - } - } - - /** - * Get transaction payload - * - * @return TransactionCreate - */ - private TransactionCreate getTransactionPayload() { - if (this.transactionPayload == null) { - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Red T-Shirt") - .uniqueId("5412") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(29.95)) - .sku("red-t-shirt-123"); - - - // Customer email address - String customerEmailAddress = "test@example.com"; - - - // Customer Billind Address - AddressCreate billingAddress = new AddressCreate(); - billingAddress.city("Winterthur") - .country("CH") - .emailAddress(customerEmailAddress) - .familyName("Customer") - .givenName("Good") - .postcode("8400") - .postalState("ZH") - .organizationName("Test GmbH") - .mobilePhoneNumber("+41791234567") - .salutation("Ms"); - - this.transactionPayload = new TransactionCreate(); - this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US"); - this.transactionPayload.setBillingAddress(billingAddress); - this.transactionPayload.setShippingAddress(billingAddress); - this.transactionPayload.addLineItemsItem(lineItem); - this.transactionPayload.setCustomerId("1234"); - this.transactionPayload.setCustomerEmailAddress(customerEmailAddress); - } - return this.transactionPayload; - } - - - /** - * Confirm - *

- * The confirm operation marks the transaction as confirmed. Once the transaction is confirmed no more changes can be applied. - * - */ - @Ignore - @Test - public void confirmTest() { - // TODO: test validations - } - - /** - * Count - *

- * Counts the number of items in the database as restricted by the given filter. - * - */ - @Test - public void countTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - EntityQueryFilter filter = new EntityQueryFilter(); - filter.type(EntityQueryFilterType.LEAF) - .fieldName("id") - .value(transaction.getId()) - .operator(CriteriaOperator.EQUALS); - Long count = this.apiClient.getTransactionService().count(this.spaceId, filter); - Assert.assertEquals((long) count, (long) 1); - } - - /** - * Create - *

- * Creates the entity with the given properties. - */ - @Test - public void createTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - Assert.assertEquals(transaction.getState(), TransactionState.PENDING); - } - - /** - * Create Transaction Credentials - *

- * This operation allows to create transaction credentials to delegate temporarily the access to the web service API for this particular transaction. - */ - @Test - public void createTransactionCredentialsTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - String transactionCredentials = this.apiClient.getTransactionService().createTransactionCredentials(this.spaceId, transaction.getId()); - Assert.assertTrue(!transactionCredentials.isEmpty()); - } - - /** - * Delete One-Click Token with Credentials - *

- * This operation removes the given token. - */ - @Ignore - @Test - public void deleteOneClickTokenWithCredentialsTest() { - // TODO: test validations - } - - /** - * Export - *

- * Exports the transactions into a CSV file. The file will contain the properties defined in the request. - */ - @Ignore - @Test - public void exportTest() { - // TODO: test validations - } - - /** - * Fetch One Click Tokens with Credentials - *

- * This operation returns the token version objects which references the tokens usable as one-click payment tokens for the provided transaction. - */ - @Ignore - @Test - public void fetchOneClickTokensWithCredentialsTest() { - // TODO: test validations - } - - /** - * Fetch Possible Payment Methods - *

- * This operation allows to get the payment method configurations which can be used with the provided transaction. - * payment_page, iframe, lightbox, mobile_web_view, terminal, payment_link, charge_flow, direct_card_processing - */ - @Test - public void fetchPaymentMethodsTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - List paymentMethods = this.apiClient.getTransactionService().fetchPaymentMethods(this.spaceId, transaction.getId(), "payment_page"); - Assert.assertTrue(paymentMethods.size() >= 1); - } - - /** - * Fetch Possible Payment Methods with Credentials - *

- * This operation allows to get the payment method configurations which can be used with the provided transaction. - */ - @Ignore - @Test - public void fetchPaymentMethodsWithCredentialsTest() { - // TODO: test validations - } - - /** - * getLatestTransactionLineItemVersion - */ - @Ignore - @Test - public void getLatestTransactionLineItemVersionTest() { - // TODO: test validations - } - - /** - * getPackingSlip - *

- * Returns the packing slip for the transaction with given id. - */ - @Ignore - @Test - public void getPackingSlipTest() { - // TODO: test validations - } - - /** - * Process One-Click Token with Credentials - *

- * This operation assigns the given token to the transaction and process it. This method will return an URL where the customer has to be redirect to complete the transaction. - */ - @Ignore - @Test - public void processOneClickTokenAndRedirectWithCredentialsTest() { - // TODO: test validations - } - - /** - * Process Without User Interaction - *

- * This operation processes the transaction without requiring that the customer is present. Means this operation applies strategies to process the transaction without a direct interaction with the buyer. This operation is suitable for recurring transactions. - * - */ - @Test - public void processWithoutUserInteractionTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - transaction = this.apiClient.getTransactionService().processWithoutUserInteraction(spaceId, transaction.getId()); - // wait for transaction to be authorized - for (int i = 1; i <= 10; i++) { - if ( - transaction.getState() == TransactionState.FULFILL || - transaction.getState() == TransactionState.FAILED - ) { - break; - } - - try { - Thread.sleep(i * 500); - } catch (InterruptedException e) { - System.err.println(e.getMessage()); - } - transaction = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId()); - } - TransactionState[] TransactionStates = { - TransactionState.FULFILL - }; - if (transaction.getState() == TransactionState.FULFILL) { - Assert.assertTrue(Arrays.asList(TransactionStates).contains(transaction.getState())); - - - RenderedDocument renderedDocument = this.apiClient.getTransactionService().getInvoiceDocument(this.spaceId, transaction.getId()); - Assert.assertEquals(true, renderedDocument.getData() != null); - Assert.assertEquals(true, renderedDocument.getData().length > 0); - } else { - System.err.println("API response timeout"); - } - } - - /** - * Read - *

- * Reads the entity with the given 'id' and returns it. - */ - @Test - public void readTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - Transaction transactionRead = this.apiClient.getTransactionService().read(this.spaceId, transaction.getId()); - Assert.assertTrue(transaction.getId().equals(transactionRead.getId())); - } - - /** - * Read With Credentials - *

- * Reads the transaction with the given 'id' and returns it. This method uses the credentials to authenticate and identify the transaction. - */ - @Ignore - @Test - public void readWithCredentialsTest() { - // TODO: test validations - } - - /** - * Search - *

- * Searches for the entities as specified by the given query. - */ - @Test - public void searchTest() throws Exception{ - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - EntityQueryFilter entityQueryFilter = new EntityQueryFilter(); - entityQueryFilter.fieldName("id") - .value(transaction.getId()) - .type(EntityQueryFilterType.LEAF) - .operator(CriteriaOperator.EQUALS); - - EntityQuery entityQuery = new EntityQuery(); - entityQuery.setFilter(entityQueryFilter); - List transactionSearch = this.apiClient.getTransactionService().search(this.spaceId, entityQuery); - Assert.assertEquals(transactionSearch.size(), 1); - for (Transaction t : transactionSearch) { - Assert.assertEquals(t.getState(), TransactionState.PENDING); - } - } - - /** - * Update - *

- * This updates the entity with the given properties. Only those properties which should be updated can be provided. The 'id' and 'version' are required to identify the entity. - */ - @Test - public void updateTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - TransactionPending transactionPending = new TransactionPending(); - transactionPending.id(transaction.getId()).language("en-US"); - transactionPending.version(transaction.getVersion().longValue()); - transactionPending.setCurrency(transaction.getCurrency()); - Transaction transactionUpdate = this.apiClient.getTransactionService().update(spaceId, transactionPending); - Assert.assertEquals(transaction.getId(), transactionUpdate.getId()); - } - - /** - * updateTransactionLineItems - */ - @Test - public void updateTransactionLineItemsTest() throws Exception { - Transaction transaction = this.apiClient.getTransactionService().create(this.spaceId, this.getTransactionPayload()); - - // Line item - LineItemCreate lineItem = new LineItemCreate(); - lineItem.name("Blue T-Shirt") - .uniqueId("5413") - .type(LineItemType.PRODUCT) - .quantity(BigDecimal.valueOf(1)) - .amountIncludingTax(BigDecimal.valueOf(39.95)) - .sku("blue-t-shirt-123"); - - TransactionPending transactionPending = new TransactionPending(); - transactionPending.version(transaction.getVersion().longValue()) - .id(transaction.getId()) - .addLineItemsItem(lineItem) - .customerId(transaction.getCustomerId()) - .currency(transaction.getCurrency()); - Transaction transactionUpdate = this.apiClient.getTransactionService().update(spaceId, transactionPending); - Assert.assertEquals(transaction.getId(), transactionUpdate.getId()); - } + assertEquals("State must be SUCCESSFUL", + TransactionCompletionState.SUCCESSFUL, completedTransaction1.getState()); + tokenService.delete(SPACE_ID, token.getId()); + } }