Merge pull request #1042 from ZanochkynYehor/SUPPORT-38780-parcelmixin-todraftbuilder-npe

Author: jenschude

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/order/ParcelMixin.java

@@ -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;
 
@@ -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() {

commercetools/internal-docs/src/test/java/example/HelperMethodsTest.java

@@ -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() {