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

# Conflicts:
#	commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/ProductUtil.java

Author: ShipilA

.git-blame-ignore-revs

@@ -13,3 +13,4 @@ a0945d605699e8e7aca9448767ba1286b7ebb2c1
 7ceb871552e5d9cb0379fbba014690aa067061eb
 af9205fa592e4ae32ceca951c560a48b512b7744
 6154ba1d1461d9279a305b52d8dd4b842e848545
+0b5dd8bee320456962d94cb845e9d27469a34091

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

@@ -1,15 +1,16 @@
 
 package com.commercetools.sdk;
 
+import java.util.Optional;
+
 import com.commercetools.api.models.IdentifiableObjHolder;
 import com.commercetools.api.models.WithKey;
 import com.commercetools.api.models.common.Reference;
 
-import java.util.Optional;
-
 public class ExpandObjResolverService implements KeyResolverService {
 
-    @Override public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable) {
+    @Override
+    public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable) {
         return Optional.ofNullable(identifiable).map(T::getObj).map(TRes::getKey).orElse(null);
     }
 }

commercetools/commercetools-importapi-utils/src/test/java/com/commercetools/sdk/ProductUtilTest.java

@@ -232,7 +232,7 @@ void productTransformTestAttributesStrSet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("text-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((TextSetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((TextSetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 
     @Test
@@ -243,7 +243,7 @@ void productTransformTestAttributesIntSet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("number-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((NumberSetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((NumberSetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 
     @Test
@@ -254,7 +254,7 @@ void productTransformTestAttributesBoolSet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("boolean-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((BooleanSetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((BooleanSetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 
     @Test
@@ -265,7 +265,7 @@ void productTransformTestAttributesDoubleSet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("number-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((NumberSetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((NumberSetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 
     @Test
@@ -276,7 +276,7 @@ void productTransformTestAttributesLStringSet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("ltext-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((LocalizableTextSetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((LocalizableTextSetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 
     @Test
@@ -287,6 +287,6 @@ void productTransformTestAttributesMoneySet() {
         var transformedProduct = util.toProductDraftImport(testProduct);
         assertEquals(testProduct.getKey(), transformedProduct.getKey());
         assertEquals("money-set", transformedProduct.getAttributes().get(0).getType());
-        assertEquals(2, ((MoneySetAttribute)transformedProduct.getAttributes().get(0)).getValue().size());
+        assertEquals(2, ((MoneySetAttribute) transformedProduct.getAttributes().get(0)).getValue().size());
     }
 }