Merge pull request #26 from swlodarski-sumoheavy/feature/SP-1197

bobbrodie · web-flow · commit d9581c8c0181 · 2025-03-28T18:04:34.000-04:00
SP-1197 - Java Kiosk Demo: Update dependencies
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'checkstyle'
-    id 'org.springframework.boot' version '3.0.2'
-    id 'io.spring.dependency-management' version '1.1.0'
+    id 'org.springframework.boot' version '3.3.10'
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'java'
 }
 
@@ -26,15 +26,15 @@ sourceSets {
 
 dependencies {
     developmentOnly("org.springframework.boot:spring-boot-devtools")
-    compileOnly 'org.projectlombok:lombok:1.18.26'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.bitpay:bitpay_sdk:9.0.0-beta1'
-    implementation 'org.liquibase:liquibase-core:4.19.0'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
+    implementation 'com.google.code.gson:gson:2.12.1'
+    implementation 'com.bitpay:bitpay_sdk:9.0.2'
+    implementation 'org.liquibase:liquibase-core:4.31.1'
     implementation 'com.h2database:h2:2.1.214'
-    implementation 'org.springframework:spring-webflux:6.0.5'
-    implementation 'org.springframework:spring-websocket:6.0.5'
-    implementation 'org.springframework:spring-messaging:6.0.5'
-    implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.0.2"
+    implementation 'org.springframework:spring-webflux:6.2.5'
+    implementation 'org.springframework:spring-websocket:6.2.5'
+    implementation 'org.springframework:spring-messaging:6.2.5'
+    implementation "org.springframework.boot:spring-boot-starter-data-jpa:3.4.4"
     implementation 'org.springframework.boot:spring-boot-starter-log4j2'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/src/intTest/java/com/bitpay/demo/donation/infrastructure/ui/createdonation/CreateDonationIntegrationTest.java b/src/intTest/java/com/bitpay/demo/donation/infrastructure/ui/createdonation/CreateDonationIntegrationTest.java
@@ -8,7 +8,7 @@
 import com.bitpay.demo.AbstractUiIntegrationTest;
 import com.bitpay.sdk.Client;
 import com.bitpay.sdk.exceptions.InvoiceCreationException;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Invoice;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Assertions;
diff --git a/src/intTest/java/com/bitpay/demo/invoice/infrastructure/ui/createinvoice/CreateInvoiceIntegrationTest.java b/src/intTest/java/com/bitpay/demo/invoice/infrastructure/ui/createinvoice/CreateInvoiceIntegrationTest.java
@@ -8,7 +8,7 @@
 import com.bitpay.demo.AbstractUiIntegrationTest;
 import com.bitpay.sdk.Client;
 import com.bitpay.sdk.exceptions.InvoiceCreationException;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Invoice;
 import java.util.Map;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/CreateBitPayInvoice.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/CreateBitPayInvoice.java
@@ -11,8 +11,8 @@
 import com.bitpay.demo.shared.bitpayproperties.BitPayProperties;
 import com.bitpay.sdk.Client;
 import com.bitpay.sdk.exceptions.BitPayException;
-import com.bitpay.sdk.model.Invoice.Buyer;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Buyer;
+import com.bitpay.sdk.model.invoice.Invoice;
 import java.util.Map;
 import java.util.UUID;
 import lombok.NonNull;
@@ -51,7 +51,7 @@ public Invoice execute(
         invoice.setTransactionSpeed("medium");
         invoice.setItemDesc(StringUtils.capitalize(this.bitPayProperties.getMode()));
         invoice.setPosData(posData);
-        invoice.setNotificationURL(this.getNotificationUrl.execute(uuid));
+        invoice.setNotificationUrl(this.getNotificationUrl.execute(uuid));
         invoice.setExtendedNotifications(true);
 
         if (validatedParams.keySet().stream().anyMatch(key -> key.startsWith("buyer"))) {
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/CreateInvoice.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/CreateInvoice.java
@@ -13,7 +13,7 @@
 import com.bitpay.demo.shared.logger.LogCode;
 import com.bitpay.demo.shared.logger.Logger;
 import com.bitpay.sdk.exceptions.BitPayException;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Invoice;
 import java.util.Map;
 import java.util.UUID;
 import lombok.NonNull;
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerFactory.java
@@ -17,8 +17,8 @@
 import com.bitpay.demo.invoice.domain.buyer.BuyerProvidedEmail;
 import com.bitpay.demo.invoice.domain.buyer.BuyerRegion;
 import com.bitpay.demo.invoice.domain.buyer.InvoiceBuyer;
-import com.bitpay.sdk.model.Invoice.Invoice;
-import com.bitpay.sdk.model.Invoice.InvoiceBuyerProvidedInfo;
+import com.bitpay.sdk.model.invoice.Invoice;
+import com.bitpay.sdk.model.invoice.InvoiceBuyerProvidedInfo;
 import java.util.Objects;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerProvidedInfoFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerProvidedInfoFactory.java
@@ -21,7 +21,7 @@ class InvoiceBuyerProvidedInfoFactory {
 
     @NonNull
     public InvoiceBuyerProvidedInfo create(
-        @NonNull final com.bitpay.sdk.model.Invoice.InvoiceBuyerProvidedInfo invoiceBuyerProvidedInfo
+        @NonNull final com.bitpay.sdk.model.invoice.InvoiceBuyerProvidedInfo invoiceBuyerProvidedInfo
     ) {
         return new InvoiceBuyerProvidedInfo(
             new BuyerName(invoiceBuyerProvidedInfo.getName()),
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceFactory.java
@@ -34,8 +34,8 @@
 import com.bitpay.demo.invoice.domain.Token;
 import com.bitpay.demo.invoice.domain.TransactionSpeed;
 import com.bitpay.demo.invoice.domain.itemizeddetail.InvoiceItemizedDetail;
-import com.bitpay.sdk.model.Invoice.InvoiceItemizedDetails;
-import com.bitpay.sdk.model.Invoice.InvoiceTransaction;
+import com.bitpay.sdk.model.invoice.InvoiceItemizedDetails;
+import com.bitpay.sdk.model.invoice.InvoiceTransaction;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -71,7 +71,7 @@ class InvoiceFactory {
 
     @NonNull
     Invoice create(
-        @NonNull final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice,
+        @NonNull final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice,
         @NonNull final InvoiceUuid uuid
     ) {
         final var invoice = new Invoice(
@@ -92,8 +92,8 @@ Invoice create(
             new BitPayGuid(bitPayInvoice.getGuid()),
             new ExceptionStatus(bitPayInvoice.getExceptionStatus()),
             new BitPayUrl(bitPayInvoice.getUrl()),
-            new RedirectUrl(bitPayInvoice.getRedirectURL()),
-            new CloseUrl(bitPayInvoice.getCloseURL()),
+            new RedirectUrl(bitPayInvoice.getRedirectUrl()),
+            new CloseUrl(bitPayInvoice.getCloseUrl()),
             new AcceptanceWindow(bitPayInvoice.getAcceptanceWindow()),
             new Token(bitPayInvoice.getToken()),
             new MerchantName(bitPayInvoice.getMerchantName()),
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceItemizedDetailFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceItemizedDetailFactory.java
@@ -11,7 +11,7 @@
 import com.bitpay.demo.invoice.domain.itemizeddetail.Description;
 import com.bitpay.demo.invoice.domain.itemizeddetail.InvoiceItemizedDetail;
 import com.bitpay.demo.invoice.domain.itemizeddetail.IsFee;
-import com.bitpay.sdk.model.Invoice.InvoiceItemizedDetails;
+import com.bitpay.sdk.model.invoice.InvoiceItemizedDetails;
 import lombok.NonNull;
 
 @DependencyInjection
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentCurrencyFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentCurrencyFactory.java
@@ -25,9 +25,9 @@
 import com.bitpay.demo.invoice.domain.payment.Subtotal;
 import com.bitpay.demo.invoice.domain.payment.Total;
 import com.bitpay.demo.invoice.domain.payment.TotalFee;
-import com.bitpay.sdk.model.Invoice.MinerFees;
-import com.bitpay.sdk.model.Invoice.MinerFeesItem;
-import com.bitpay.sdk.model.Invoice.SupportedTransactionCurrencies;
+import com.bitpay.sdk.model.invoice.MinerFees;
+import com.bitpay.sdk.model.invoice.MinerFeesItem;
+import com.bitpay.sdk.model.invoice.SupportedTransactionCurrencies;
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Map;
@@ -42,7 +42,7 @@ class InvoicePaymentCurrencyFactory {
     InvoicePaymentCurrency create(
         @NonNull final Map.Entry<String, String> code,
         @NonNull final InvoicePayment invoicePayment,
-        @NonNull final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice
+        @NonNull final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice
     ) {
         final var bitPaySupportedTransactionCurrency = getBitPaySupportedTransactionCurrency(
             code.getKey(),
@@ -129,7 +129,7 @@ private MinerFeesItem getBitPayMinerFee(
     }
 
     @Nullable
-    private com.bitpay.sdk.model.Invoice.SupportedTransactionCurrency getBitPaySupportedTransactionCurrency(
+    private com.bitpay.sdk.model.invoice.SupportedTransactionCurrency getBitPaySupportedTransactionCurrency(
         @NonNull final String code,
         @NonNull final SupportedTransactionCurrencies supportedTransactionCurrencies
     ) {
@@ -159,7 +159,7 @@ private InvoicePaymentCurrencyMinerFee getMinerFee(@Nullable final MinerFeesItem
 
     @NonNull
     private InvoicePaymentCurrencySupportedTransactionCurrency getSupportedTransactionCurrency(
-        @Nullable final com.bitpay.sdk.model.Invoice.SupportedTransactionCurrency bitPaySupportedTransactionCurrency
+        @Nullable final com.bitpay.sdk.model.invoice.SupportedTransactionCurrency bitPaySupportedTransactionCurrency
     ) {
         if (Objects.isNull(bitPaySupportedTransactionCurrency)) {
             return new InvoicePaymentCurrencySupportedTransactionCurrency(
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentFactory.java
@@ -30,7 +30,7 @@ class InvoicePaymentFactory {
     }
 
     @NonNull
-    InvoicePayment create(@NonNull final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice) {
+    InvoicePayment create(@NonNull final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice) {
         final var invoicePayment = new InvoicePayment(
             new AmountPaid(bitPayInvoice.getAmountPaid().doubleValue()),
             new DisplayAmountPaid(bitPayInvoice.getDisplayAmountPaid().doubleValue()),
@@ -59,7 +59,7 @@ InvoicePayment create(@NonNull final com.bitpay.sdk.model.Invoice.Invoice bitPay
     @NonNull
     private Collection<InvoicePaymentCurrency> getInvoicePaymentCurrencies(
         @NonNull final InvoicePayment invoicePayment,
-        @NonNull final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice
+        @NonNull final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice
     ) {
         return bitPayInvoice.getPaymentTotals().entrySet().stream()
             .map(code -> this.invoicePaymentCurrencyFactory.create(code, invoicePayment, bitPayInvoice))
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundFactory.java
@@ -11,8 +11,8 @@
 import com.bitpay.demo.invoice.domain.refund.RefundAddressRequestPending;
 import com.bitpay.demo.invoice.domain.refund.RefundAddressesJson;
 import com.bitpay.demo.shared.ObjectToJsonConverter;
-import com.bitpay.sdk.model.Invoice.Invoice;
-import com.bitpay.sdk.model.Invoice.RefundInfo;
+import com.bitpay.sdk.model.invoice.Invoice;
+import com.bitpay.sdk.model.invoice.RefundInfo;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundInfoFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundInfoFactory.java
@@ -12,7 +12,7 @@
 import com.bitpay.demo.invoice.domain.refund.InvoiceRefundInfo;
 import com.bitpay.demo.invoice.domain.refund.InvoiceRefundInfoAmount;
 import com.bitpay.demo.invoice.domain.refund.SupportRequest;
-import com.bitpay.sdk.model.Invoice.RefundInfo;
+import com.bitpay.sdk.model.invoice.RefundInfo;
 import java.util.Collection;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceTransactionFactory.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceTransactionFactory.java
@@ -10,7 +10,7 @@
 import com.bitpay.demo.invoice.domain.Invoice;
 import com.bitpay.demo.invoice.domain.transaction.Confirmations;
 import com.bitpay.demo.invoice.domain.transaction.Txid;
-import com.bitpay.sdk.model.Invoice.InvoiceTransaction;
+import com.bitpay.sdk.model.invoice.InvoiceTransaction;
 import java.time.ZoneId;
 import java.util.Objects;
 import lombok.NonNull;
diff --git a/src/main/java/com/bitpay/demo/invoice/application/features/tasks/updateinvoice/ValidateUpdateData.java b/src/main/java/com/bitpay/demo/invoice/application/features/tasks/updateinvoice/ValidateUpdateData.java
@@ -8,7 +8,7 @@
 import com.bitpay.demo.DependencyInjection;
 import com.bitpay.demo.invoice.domain.BitPayId;
 import com.bitpay.demo.shared.StringToObjectParser;
-import com.bitpay.sdk.model.Invoice.InvoiceStatus;
+import com.bitpay.sdk.model.invoice.InvoiceStatus;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/shared/InvoiceDtoMapperTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/shared/InvoiceDtoMapperTest.java
@@ -7,6 +7,7 @@
 
 import com.bitpay.demo.UnitTest;
 import com.bitpay.demo.invoice.domain.Invoice;
+import java.util.Locale;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -15,6 +16,8 @@ class InvoiceDtoMapperTest implements UnitTest {
 
     @Test
     void shouldMapInvoiceToInvoiceDto() throws JSONException {
+        Locale.setDefault(Locale.ENGLISH);
+
         // given
         final String invoiceJson = getDataFromFile("invoice.json");
         final Invoice invoice = toObject(invoiceJson, Invoice.class);
@@ -24,8 +27,8 @@ void shouldMapInvoiceToInvoiceDto() throws JSONException {
 
         // then
         JSONAssert.assertEquals(
-            toJson(result),
             getDataFromFile("invoiceDto.json"),
+            toJson(result),
             false
         );
     }
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/GetBitPayInvoice.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/GetBitPayInvoice.java
@@ -6,7 +6,7 @@
 package com.bitpay.demo.invoice.application.features.tasks.createinvoice;
 
 import com.bitpay.demo.UnitTest;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Invoice;
 
 interface GetBitPayInvoice extends UnitTest {
 
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerFactoryTest.java
@@ -15,7 +15,7 @@
 import com.bitpay.demo.invoice.domain.buyer.BuyerSmsVerified;
 import com.bitpay.demo.invoice.domain.buyer.InvoiceBuyer;
 import com.bitpay.demo.invoice.domain.buyer.InvoiceBuyerProvidedInfo;
-import com.bitpay.sdk.model.Invoice.Invoice;
+import com.bitpay.sdk.model.invoice.Invoice;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
@@ -27,12 +27,12 @@ class InvoiceBuyerFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoiceBuyer() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final InvoiceBuyer result = getTestedClass().create(
             bitPayInvoice,
-            Mockito.mock(com.bitpay.sdk.model.Invoice.InvoiceBuyerProvidedInfo.class)
+            Mockito.mock(com.bitpay.sdk.model.invoice.InvoiceBuyerProvidedInfo.class)
         );
 
         // then
@@ -47,12 +47,12 @@ void shouldMapToInvoiceBuyer() throws JSONException {
     void shouldMapToInvoiceBuyerWhenBitPayHasNotBuyer() throws JSONException {
         // given
         final String bitPayInvoiceJson = getDataFromFile("bitPayInvoiceWithoutBuyer.json");
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = toObject(bitPayInvoiceJson, Invoice.class);
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = toObject(bitPayInvoiceJson, Invoice.class);
 
         // when
         final InvoiceBuyer result = getTestedClass().create(
             bitPayInvoice,
-            Mockito.mock(com.bitpay.sdk.model.Invoice.InvoiceBuyerProvidedInfo.class)
+            Mockito.mock(com.bitpay.sdk.model.invoice.InvoiceBuyerProvidedInfo.class)
         );
 
         // then
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerProvidedInfoFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceBuyerProvidedInfoFactoryTest.java
@@ -15,7 +15,7 @@ class InvoiceBuyerProvidedInfoFactoryTest implements UnitTest, GetBitPayInvoice
     @Test
     void shouldMapToInvoiceBuyerProvidedInfo() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final com.bitpay.demo.invoice.domain.buyer.InvoiceBuyerProvidedInfo result = getTestedClass()
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceFactoryTest.java
@@ -40,7 +40,7 @@ class InvoiceFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoice() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(bitPayInvoice, new InvoiceUuid("123-456-789"));
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceItemizedDetailFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceItemizedDetailFactoryTest.java
@@ -16,7 +16,7 @@ class InvoiceItemizedDetailFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoiceItemizedDetail() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
         final var invoiceJson = getDataFromFile("invoice.json");
         final var invoice = toObject(invoiceJson, Invoice.class);
 
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentCurrencyFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentCurrencyFactoryTest.java
@@ -16,7 +16,7 @@ class InvoicePaymentCurrencyFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoicePaymentCurrency() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoicePaymentFactoryTest.java
@@ -30,7 +30,7 @@ class InvoicePaymentFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoicePayment() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(bitPayInvoice);
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundFactoryTest.java
@@ -22,7 +22,7 @@ class InvoiceRefundFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoiceRefund() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(bitPayInvoice);
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundInfoFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceRefundInfoFactoryTest.java
@@ -17,7 +17,7 @@ class InvoiceRefundInfoFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoiceRefundInfo() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(
diff --git a/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceTransactionFactoryTest.java b/src/test/java/com/bitpay/demo/invoice/application/features/tasks/createinvoice/InvoiceTransactionFactoryTest.java
@@ -17,7 +17,7 @@ class InvoiceTransactionFactoryTest implements UnitTest, GetBitPayInvoice {
     @Test
     void shouldMapToInvoiceTransaction() throws JSONException {
         // given
-        final com.bitpay.sdk.model.Invoice.Invoice bitPayInvoice = getBitPayInvoice();
+        final com.bitpay.sdk.model.invoice.Invoice bitPayInvoice = getBitPayInvoice();
 
         // when
         final var result = getTestedClass().create(
