From 45b9601a220e995af012729c05a1863817718f8a Mon Sep 17 00:00:00 2001 From: Anna Shipil Date: Fri, 19 Sep 2025 16:37:14 +0200 Subject: [PATCH 1/6] SUPPORT-35419: making custom field not required --- .../payment/PaymentMethodInfoMixin.java | 5 +++- .../PaymentMethodInfoMixinTest.java | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java index 8ee5d24e0f6..70ec3c0cd94 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java @@ -4,6 +4,9 @@ import com.commercetools.api.models.common.LocalizedString; import com.commercetools.api.models.payment_method.PaymentMethodToken; import com.commercetools.api.models.type.CustomFields; +import com.commercetools.api.models.type.CustomFieldsMixin; + +import java.util.Optional; public interface PaymentMethodInfoMixin { @@ -26,7 +29,7 @@ public default PaymentMethodInfoDraft toDraft() { .paymentInterface(getPaymentInterface()) .token(getToken()) .interfaceAccount(getInterfaceAccount()) - .custom(getCustom().toDraft()) + .custom(Optional.ofNullable(getCustom()).map(CustomFieldsMixin::toDraft).orElse(null)) .build(); } } diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java new file mode 100644 index 00000000000..6041c41b923 --- /dev/null +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java @@ -0,0 +1,28 @@ +package com.commercetools; + +import com.commercetools.api.models.cart_discount.CartDiscountValue; +import com.commercetools.api.models.cart_discount.CartDiscountValueAbsoluteDraft; +import com.commercetools.api.models.common.LocalizedString; +import com.commercetools.api.models.common.Money; +import com.commercetools.api.models.customer.CustomerResourceIdentifierBuilder; +import com.commercetools.api.models.payment.PaymentDraft; +import com.commercetools.api.models.payment.PaymentMethodInfo; +import org.assertj.core.api.Assert; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class PaymentMethodInfoMixinTest { + @Test + public void noCustomFieldTest() { + var paymentMethodInfo = PaymentMethodInfo.builder() + .paymentInterface("interface") + .method("method") + .name(LocalizedString.of()) + .build(); + + assertNotNull(paymentMethodInfo.toDraft()); + } +} From 7ceb871552e5d9cb0379fbba014690aa067061eb Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:40:21 +0000 Subject: [PATCH 2/6] spotless: Fix code style --- .../api/models/payment/PaymentMethodInfoMixin.java | 4 ++-- .../commercetools/PaymentMethodInfoMixinTest.java | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java index 70ec3c0cd94..3228e861b68 100644 --- a/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java +++ b/commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/payment/PaymentMethodInfoMixin.java @@ -1,13 +1,13 @@ package com.commercetools.api.models.payment; +import java.util.Optional; + import com.commercetools.api.models.common.LocalizedString; import com.commercetools.api.models.payment_method.PaymentMethodToken; import com.commercetools.api.models.type.CustomFields; import com.commercetools.api.models.type.CustomFieldsMixin; -import java.util.Optional; - public interface PaymentMethodInfoMixin { public String getPaymentInterface(); diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java index 6041c41b923..c858e306d67 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java @@ -1,18 +1,12 @@ + package com.commercetools; -import com.commercetools.api.models.cart_discount.CartDiscountValue; -import com.commercetools.api.models.cart_discount.CartDiscountValueAbsoluteDraft; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.commercetools.api.models.common.LocalizedString; -import com.commercetools.api.models.common.Money; -import com.commercetools.api.models.customer.CustomerResourceIdentifierBuilder; -import com.commercetools.api.models.payment.PaymentDraft; import com.commercetools.api.models.payment.PaymentMethodInfo; -import org.assertj.core.api.Assert; -import org.junit.jupiter.api.Test; -import org.mockito.Mock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; public class PaymentMethodInfoMixinTest { @Test From afe9f95f948d82652774fa551453bd4c22238c3a Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:40:21 +0000 Subject: [PATCH 3/6] spotless: add commit to blame ignore revs file --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 544b161a604..950fa40285d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,4 @@ de95c481329aa8b821e6e71ac35c1b8bc67e3e86 78c44064f4ec15091bde7a2dc590aa2b3a99341d 03665b75a1e1c3a3cf28df1dec52e91b308e4368 7e25c796da25ae080a952936de535a1228fed448 +7ceb871552e5d9cb0379fbba014690aa067061eb From e9c5dcbdb603205ba9cf4ac778dbf766e5ccf4eb Mon Sep 17 00:00:00 2001 From: Anna Shipil Date: Mon, 22 Sep 2025 09:57:25 +0200 Subject: [PATCH 4/6] SUPPORT-35419: fixing assertion --- .../java/com/commercetools/PaymentMethodInfoMixinTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java index 6041c41b923..8ad00ce131d 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java @@ -7,12 +7,13 @@ import com.commercetools.api.models.customer.CustomerResourceIdentifierBuilder; import com.commercetools.api.models.payment.PaymentDraft; import com.commercetools.api.models.payment.PaymentMethodInfo; +import com.commercetools.api.models.payment.PaymentMethodInfoDraft; import org.assertj.core.api.Assert; import org.junit.jupiter.api.Test; import org.mockito.Mock; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class PaymentMethodInfoMixinTest { @Test @@ -23,6 +24,6 @@ public void noCustomFieldTest() { .name(LocalizedString.of()) .build(); - assertNotNull(paymentMethodInfo.toDraft()); + assertInstanceOf(PaymentMethodInfoDraft.class, paymentMethodInfo.toDraft()); } } From af9205fa592e4ae32ceca951c560a48b512b7744 Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:09:01 +0000 Subject: [PATCH 5/6] spotless: Fix code style --- .../commercetools/PaymentMethodInfoMixinTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java index 8ad00ce131d..65e4dee8cbf 100644 --- a/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java +++ b/commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PaymentMethodInfoMixinTest.java @@ -1,19 +1,13 @@ + package com.commercetools; -import com.commercetools.api.models.cart_discount.CartDiscountValue; -import com.commercetools.api.models.cart_discount.CartDiscountValueAbsoluteDraft; +import static org.junit.jupiter.api.Assertions.*; + import com.commercetools.api.models.common.LocalizedString; -import com.commercetools.api.models.common.Money; -import com.commercetools.api.models.customer.CustomerResourceIdentifierBuilder; -import com.commercetools.api.models.payment.PaymentDraft; import com.commercetools.api.models.payment.PaymentMethodInfo; import com.commercetools.api.models.payment.PaymentMethodInfoDraft; -import org.assertj.core.api.Assert; -import org.junit.jupiter.api.Test; -import org.mockito.Mock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; public class PaymentMethodInfoMixinTest { @Test From 6f756004ed207c9b4e4346ac51866a4810cac9de Mon Sep 17 00:00:00 2001 From: "ct-sdks[bot]" <153784748+ct-sdks[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:09:01 +0000 Subject: [PATCH 6/6] spotless: add commit to blame ignore revs file --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 950fa40285d..4dc886129c0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -10,3 +10,4 @@ de95c481329aa8b821e6e71ac35c1b8bc67e3e86 03665b75a1e1c3a3cf28df1dec52e91b308e4368 7e25c796da25ae080a952936de535a1228fed448 7ceb871552e5d9cb0379fbba014690aa067061eb +af9205fa592e4ae32ceca951c560a48b512b7744