Skip to content

DEVX-741-Support-null-in-address-in-Delivery #1034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShipilA merged 6 commits into from
Feb 11, 2026
Merged

DEVX-741-Support-null-in-address-in-Delivery #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41ec4b0
DEVX-741: managing NullPointerException
ShipilA Feb 10, 2026
4e63e8f
DEVX-741: adding test
ShipilA Feb 10, 2026
f00f4fe
spotless: Fix code style
ct-sdks[bot] Feb 10, 2026
e7ad106
spotless: add commit to blame ignore revs file
ct-sdks[bot] Feb 10, 2026
d9e4f87
DEVX-741: adding assertions to the test
ShipilA Feb 11, 2026
03d5acb
Merge remote-tracking branch 'origin/DEVX-741-Support-null-in-address…
ShipilA Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ c4e2bf407aa0b7a3d34605134791013ba8a2d376
9232c8f806b5eebeff35c09b1616b6598f3f5e73
062fb57831db2e3e25afc1bd63cf8b09d46ffa67
13fa17ad575aadf0ef823d63d86fbbdd4a37cd9b
f00f4fe6ed5e22cdd2e3f68370c2da96e6bbc8e7
5 changes: 3 additions & 2 deletions ...rcetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/DeliveryMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package com.commercetools.api.models.order;

import java.util.List;
import java.util.Optional;

import com.commercetools.api.models.common.Address;
import com.commercetools.api.models.type.CustomFields;
Expand All @@ -17,10 +18,10 @@ public interface DeliveryMixin {

public default DeliveryDraftBuilder toDraftBuilder() {
return DeliveryDraft.builder()
.address(this.getAddress().toDraft())
.address(Optional.ofNullable(this.getAddress()).map(Address::toDraft).orElse(null))
.items(this.getItems())
.parcels(this.getParcels().stream().map(Parcel::toDraft).collect(java.util.stream.Collectors.toList()))
.custom(this.getCustom().toDraft());
.custom(Optional.ofNullable(this.getCustom()).map(CustomFields::toDraft).orElse(null));
}

public default DeliveryDraft toDraft() {
Expand Down
14 changes: 13 additions & 1 deletion commercetools/internal-docs/src/test/java/example/HelperMethodsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toList;

import java.time.ZonedDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
Expand Down Expand Up @@ -67,6 +68,8 @@

import org.javamoney.moneta.CurrencyUnitBuilder;
import org.javamoney.moneta.FastMoney;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

// the scope of this class is to give the possibility to the JAvaDoc to get the related examples
public class HelperMethodsTest {
Expand Down Expand Up @@ -966,10 +969,19 @@ public void deliveryToDraft() {
final DeliveryDraft deliveryDraft = delivery.toDraft();
}

@Test
public void deliveryToDraftBuilder() {
final Delivery delivery = DeliveryBuilder.of().id("delivery-id").build();
final Delivery delivery = DeliveryBuilder.of()
.id("delivery-id")
.createdAt(ZonedDateTime.now())
.items(List.of())
.parcels(List.of())
.build();

final DeliveryDraftBuilder deliveryDraftBuilder = delivery.toDraftBuilder();
Assertions.assertNotNull(deliveryDraftBuilder);
Assertions.assertNull(deliveryDraftBuilder.getAddress());
Assertions.assertNull(deliveryDraftBuilder.getCustom());
}

public void orderSetDeliveryAddressUnset() {
Expand Down