Correct calls to SyncUtility and revert check for "KEY_NOT_SET"

Author: salander85

src/main/java/com/commercetools/sync/categories/utils/CategoryReferenceResolutionUtils.java

@@ -83,15 +83,7 @@ private static CategoryDraft mapToCategoryDraft(
         getResourceIdentifierWithKey(
             category.getParent(),
             referenceIdToKeyCache,
-            (id, key) -> {
-              final CategoryResourceIdentifierBuilder builder =
-                  CategoryResourceIdentifierBuilder.of();
-              if (id == null) {
-                return builder.key(key).build();
-              } else {
-                return builder.id(id).build();
-              }
-            });
+            (id, key) -> CategoryResourceIdentifierBuilder.of().key(key).id(id).build());
     return CategoryDraftBuilder.of()
         .key(category.getKey())
         .slug(category.getSlug())

src/main/java/com/commercetools/sync/commons/utils/CustomTypeReferenceResolutionUtils.java

@@ -70,16 +70,11 @@ public static CustomFieldsDraft mapToCustomFieldsDraft(
                                     SyncUtils.getResourceIdentifierWithKey(
                                         typeReference,
                                         referenceIdToKeyCache,
-                                        (id, key) -> {
-                                          final TypeResourceIdentifierBuilder builder =
-                                              TypeResourceIdentifierBuilder.of();
-                                          if (id == null) {
-
-                                            return builder.key(key).build();
-                                          } else {
-                                            return builder.id(id).build();
-                                          }
-                                        }))
+                                        (id, key) ->
+                                            TypeResourceIdentifierBuilder.of()
+                                                .key(key)
+                                                .id(id)
+                                                .build()))
                             .orElse(null))
                     .build())
         .orElse(null);

src/main/java/com/commercetools/sync/commons/utils/SyncUtils.java

@@ -2,7 +2,6 @@
 
 import com.commercetools.api.models.common.Reference;
 import com.commercetools.api.models.common.ResourceIdentifier;
-import com.commercetools.sync.services.impl.BaseTransformServiceImpl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -71,8 +70,7 @@ ResourceIdentifierT getResourceIdentifierWithKey(
           @Nullable final String key,
           final BiFunction<String, String, ResourceIdentifierT> toResourceIdentifier) {
 
-    if (!StringUtils.isBlank(key)
-        && !BaseTransformServiceImpl.KEY_IS_NOT_SET_PLACE_HOLDER.equals(key)) {
+    if (!StringUtils.isBlank(key)) {
       return toResourceIdentifier.apply(null, key);
     }
     return toResourceIdentifier.apply(id, null);

src/main/java/com/commercetools/sync/inventories/utils/InventoryReferenceResolutionUtils.java

@@ -81,15 +81,7 @@ private static InventoryEntryDraft mapToInventoryEntryDraft(
         getResourceIdentifierWithKey(
             inventoryEntry.getSupplyChannel(),
             referenceIdToKeyCache,
-            (id, key) -> {
-              final ChannelResourceIdentifierBuilder builder =
-                  ChannelResourceIdentifierBuilder.of();
-              if (id == null) {
-                return builder.key(key).build();
-              } else {
-                return builder.id(id).build();
-              }
-            });
+            (id, key) -> ChannelResourceIdentifierBuilder.of().key(key).id(id).build());
     return InventoryEntryDraftBuilder.of()
         .sku(inventoryEntry.getSku())
         .quantityOnStock(inventoryEntry.getQuantityOnStock())

src/main/java/com/commercetools/sync/products/utils/PriceUtils.java

@@ -67,15 +67,7 @@ private static ChannelResourceIdentifier createChannelResourceIdentifier(
           getResourceIdentifierWithKey(
               channelReference,
               referenceIdToKeyCache,
-              (id, key) -> {
-                final ChannelResourceIdentifierBuilder builder =
-                    ChannelResourceIdentifierBuilder.of();
-                if (id == null) {
-                  return builder.key(key).build();
-                } else {
-                  return builder.id(id).build();
-                }
-              });
+              (id, key) -> ChannelResourceIdentifierBuilder.of().key(key).id(id).build());
     } else if (channelReference != null) {
       channelResourceIdentifier =
           ChannelResourceIdentifierBuilder.of().id(channelReference.getId()).build();

src/main/java/com/commercetools/sync/products/utils/ProductReferenceResolutionUtils.java

@@ -149,41 +149,19 @@ public static List<ProductDraft> mapToProductDrafts(
                   getResourceIdentifierWithKey(
                       product.getProductType(),
                       referenceIdToKeyCache,
-                      (id, key) -> {
-                        final ProductTypeResourceIdentifierBuilder builder =
-                            ProductTypeResourceIdentifierBuilder.of();
-                        if (id == null) {
-                          return builder.key(key).build();
-                        } else {
-                          return builder.id(id).build();
-                        }
-                      });
+                      (id, key) ->
+                          ProductTypeResourceIdentifierBuilder.of().id(id).key(key).build());
               final TaxCategoryResourceIdentifier taxCategoryResourceIdentifier =
                   getResourceIdentifierWithKey(
                       product.getTaxCategory(),
                       referenceIdToKeyCache,
-                      (id, key) -> {
-                        final TaxCategoryResourceIdentifierBuilder builder =
-                            TaxCategoryResourceIdentifierBuilder.of();
-                        if (id == null) {
-                          return builder.key(key).build();
-                        } else {
-                          return builder.id(id).build();
-                        }
-                      });
+                      (id, key) ->
+                          TaxCategoryResourceIdentifierBuilder.of().key(key).id(id).build());
               final StateResourceIdentifier stateResourceIdentifier =
                   getResourceIdentifierWithKey(
                       product.getState(),
                       referenceIdToKeyCache,
-                      (id, key) -> {
-                        final StateResourceIdentifierBuilder builder =
-                            StateResourceIdentifierBuilder.of();
-                        if (id == null) {
-                          return builder.key(key).build();
-                        } else {
-                          return builder.id(id).build();
-                        }
-                      });
+                      (id, key) -> StateResourceIdentifierBuilder.of().key(key).id(id).build());
               return productDraftBuilder
                   .masterVariant(masterVariantDraftWithKeys)
                   .variants(variantDraftsWithKeys)