Merge remote-tracking branch 'origin/DEVX-640-helper-method-from-Coco-product-to-import-API-product' into DEVX-640-helper-method-from-Coco-product-to-import-API-product

Author: ShipilA

.git-blame-ignore-revs

@@ -37,3 +37,4 @@ cd4bb52247f964cdb924e28f32a6cd888d25ccea
 3fcbbbaa899976c15f805febd6864d70d260f830
 6f16c4a0cc66ed69ab5769595332d984c4abff9f
 8453de765b5576178f2e5d5ea6b6c1a5c6668027
+1f7b152196e439257d3307b749bbe9546b05fc66

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/CommonImportUtil.java

@@ -18,7 +18,6 @@
 import com.commercetools.importapi.models.common.*;
 import com.commercetools.importapi.models.customfields.CustomField;
 
-import com.commercetools.importapi.models.productvariants.Attribute;
 import io.vrap.rmf.base.client.Builder;
 
 public class CommonImportUtil {
@@ -130,9 +129,7 @@ static CustomField mapCustomField(Object value) {
                 return CustomField.dateSetBuilder().value((ArrayList<LocalDate>) list).build();
             }
             if (list.get(0) instanceof ZonedDateTime) {
-                return CustomField.dateTimeSetBuilder()
-                        .value((ArrayList<ZonedDateTime>) list)
-                        .build();
+                return CustomField.dateTimeSetBuilder().value((ArrayList<ZonedDateTime>) list).build();
             }
             if (list.get(0) instanceof LocalTime) {
                 return CustomField.timeSetBuilder().value((ArrayList<LocalTime>) list).build();
@@ -177,7 +174,7 @@ static CustomField mapCustomField(Object value) {
                 return CustomField.moneySetBuilder()
                         .value(list.stream()
                                 .map(v -> importApiTypedMoney((com.commercetools.api.models.common.TypedMoney) v,
-                                        new TypedMoneyBuilder()).build())
+                                    new TypedMoneyBuilder()).build())
                                 .collect(Collectors.toList()))
                         .build();
             }

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/CustomerUtil.java

@@ -1,8 +1,6 @@
 
 package com.commercetools.sdk;
 
-import static java.lang.Integer.parseInt;
-
 import java.util.List;
 
 import com.commercetools.api.models.common.Address;
@@ -69,7 +67,8 @@ private AuthenticationMode toImportApiAuthenticationMode(
     }
 
     public CustomerGroupKeyReference toCustomerGroupKeyReference(CustomerGroupReference customerGroup) {
-        if (customerGroup == null) return null;
+        if (customerGroup == null)
+            return null;
         return CustomerGroupKeyReference.builder().key(keyResolverService.resolveKey(customerGroup)).build();
     }
 
@@ -83,9 +82,11 @@ private List<Integer> getAddressesIds(List<Address> shippingAddresses) {
     }
 
     private Integer getAddressesId(List<Address> addresses, String addressId) {
-        if (addressId == null) return null;
+        if (addressId == null)
+            return null;
         for (int i = 0; i < addresses.size(); i++) {
-            if (addressId.equals(addresses.get(i).getId())) return i;
+            if (addressId.equals(addresses.get(i).getId()))
+                return i;
         }
         return null;
     }