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

@@ -38,3 +38,4 @@ cd4bb52247f964cdb924e28f32a6cd888d25ccea
 6f16c4a0cc66ed69ab5769595332d984c4abff9f
 8453de765b5576178f2e5d5ea6b6c1a5c6668027
 1f7b152196e439257d3307b749bbe9546b05fc66
+5b7970b78743956139530f1476937c7de792a06c

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

@@ -12,6 +12,7 @@
 import com.commercetools.importapi.models.customers.AuthenticationMode;
 import com.commercetools.importapi.models.customers.CustomerAddress;
 import com.commercetools.importapi.models.customers.CustomerImport;
+
 import jakarta.validation.constraints.NotNull;
 
 public class CustomerUtil {

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

@@ -1,30 +1,34 @@
+
 package com.commercetools.sdk;
 
+import static com.commercetools.sdk.TestUtils.stringFromResource;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.commercetools.api.models.category.Category;
 import com.commercetools.api.models.category.CategoryImpl;
+
 import io.vrap.rmf.base.client.utils.json.JsonUtils;
+
 import org.junit.jupiter.api.Test;
+
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
 
-import static com.commercetools.sdk.TestUtils.stringFromResource;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class CategoryUtilTest {
     String categoryProjectionExample = "src/test/resources/category.example.json";
     private final ObjectMapper objectMapper = new JsonMapper();
     CategoryUtil util = new CategoryUtil();
 
     @Test
     void shouldDeserializeCategoryCorrectly() throws Exception {
-        var testCategory = JsonUtils.fromJsonString(stringFromResource(categoryProjectionExample),
-                Category.class);
+        var testCategory = JsonUtils.fromJsonString(stringFromResource(categoryProjectionExample), Category.class);
 
         assertNotNull(testCategory, "The category object should not be null.");
         assertInstanceOf(CategoryImpl.class, testCategory,
-                "The category should be an instance of Category based on the annotation.");
+            "The category should be an instance of Category based on the annotation.");
     }
+
     @Test
     void shouldMapRequiredFields() {
         var category = JsonUtils.fromJsonString(stringFromResource(categoryProjectionExample), Category.class);
@@ -41,27 +45,28 @@ void shouldMapParentKeyFromExpandedObj() {
         var result = util.toCategoryImport(category);
 
         assertNotNull(result.getParent());
-        assertEquals("parent-key", result.getParent().getKey());  // key, not UUID
+        assertEquals("parent-key", result.getParent().getKey()); // key, not UUID
     }
 
     @Test
     void shouldMapExternalId() {
         var category = JsonUtils.fromJsonString(stringFromResource(categoryProjectionExample), Category.class);
         var result = util.toCategoryImport(category);
-        assertEquals("ext-001", result.getExternalId());  // catches the getId() bug
+        assertEquals("ext-001", result.getExternalId()); // catches the getId() bug
     }
 
     @Test
     void shouldHandleNullParent() {
         // fixture without parent field
-        var category = JsonUtils.fromJsonString(stringFromResource("src/test/resources/category.no-parent.json"), Category.class);
+        var category = JsonUtils.fromJsonString(stringFromResource("src/test/resources/category.no-parent.json"),
+            Category.class);
         var result = util.toCategoryImport(category);
         assertNull(result.getParent());
     }
 
     @Test
     void shouldHandleNullCustom() {
         var category = JsonUtils.fromJsonString(stringFromResource(categoryProjectionExample), Category.class);
-        assertDoesNotThrow(() -> util.toCategoryImport(category));  // no NPE when custom is absent
+        assertDoesNotThrow(() -> util.toCategoryImport(category)); // no NPE when custom is absent
     }
 }

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

@@ -1,18 +1,22 @@
+
 package com.commercetools.sdk;
 
+import static com.commercetools.sdk.TestUtils.stringFromResource;
+import static org.junit.jupiter.api.Assertions.*;
+
 import com.commercetools.api.models.inventory.InventoryEntry;
+
 import io.vrap.rmf.base.client.utils.json.JsonUtils;
-import org.junit.jupiter.api.Test;
 
-import static com.commercetools.sdk.TestUtils.stringFromResource;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class InventoryUtilTest {
     private final InventoryUtil util = new InventoryUtil();
 
     @Test
     void shouldMapRequiredFields() {
-        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.example.json"), InventoryEntry.class);
+        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.example.json"),
+            InventoryEntry.class);
         var result = util.toInventoryImport(entry);
 
         assertEquals("inventory-key", result.getKey());
@@ -22,16 +26,18 @@ void shouldMapRequiredFields() {
 
     @Test
     void shouldMapSupplyChannelKeyFromExpandedObj() {
-        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.example.json"), InventoryEntry.class);
+        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.example.json"),
+            InventoryEntry.class);
         var result = util.toInventoryImport(entry);
 
         assertNotNull(result.getSupplyChannel());
-        assertEquals("channel-key", result.getSupplyChannel().getKey());  // catches getId() bug
+        assertEquals("channel-key", result.getSupplyChannel().getKey()); // catches getId() bug
     }
 
     @Test
     void shouldHandleNullSupplyChannel() {
-        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.no-channel.json"), InventoryEntry.class);
+        var entry = JsonUtils.fromJsonString(stringFromResource("src/test/resources/inventory.no-channel.json"),
+            InventoryEntry.class);
         var result = util.toInventoryImport(entry);
         assertNull(result.getSupplyChannel());
     }