Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.type.CustomFields;

Expand All @@ -19,7 +20,7 @@ public default ParcelDraftBuilder toDraftBuilder() {
.measurements(this.getMeasurements())
.trackingData(this.getTrackingData())
.items(this.getItems())
.custom(this.getCustom().toDraft());
.custom(Optional.ofNullable(this.getCustom()).map(CustomFields::toDraft).orElse(null));
}

public default ParcelDraft toDraft() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -957,10 +957,17 @@ public void parcelToDraft() {
final ParcelDraft parcelDraft = parcel.toDraft();
}

@Test
public void parcelToDraftBuilder() {
final Parcel parcel = ParcelBuilder.of().id("parcel-id").build();
final Parcel parcel = ParcelBuilder.of()
.id("parcel-id")
.createdAt(ZonedDateTime.now())
.build();

final ParcelDraftBuilder parcelDraftBuilder = parcel.toDraftBuilder();

Assertions.assertNotNull(parcelDraftBuilder);
Assertions.assertNull(parcelDraftBuilder.getCustom());
}

public void deliveryToDraft() {
Expand Down
Loading