Skip to content

Commit 8c635d4

Browse files
committed
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
2 parents ac54724 + 8d3f6e7 commit 8c635d4

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ cd4bb52247f964cdb924e28f32a6cd888d25ccea
3535
49ffd1c6341f8071336509d025c414de63c1a702
3636
9f889d62530cbe6f83e65e307231ae05e0efe03d
3737
3fcbbbaa899976c15f805febd6864d70d260f830
38+
6f16c4a0cc66ed69ab5769595332d984c4abff9f

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,10 @@ private static ProductVariantDraftImport extractProductVariantDraftImport(Produc
139139
}
140140

141141
public static @NotNull List<Image> toImportImages(List<com.commercetools.api.models.common.Image> images) {
142-
return images
143-
.stream()
142+
return images.stream()
144143
.map(i -> Image.builder()
145144
.dimensions(
146-
d -> AssetDimensions.builder().w(i.getDimensions().getW()).h(i.getDimensions().getH()))
145+
d -> AssetDimensions.builder().w(i.getDimensions().getW()).h(i.getDimensions().getH()))
147146
.url(i.getUrl())
148147
.label(i.getLabel())
149148
.build())

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
12
package com.commercetools.sdk;
23

3-
import com.commercetools.api.models.product.ProductProjection;
4-
import com.commercetools.api.models.product.ProductVariant;
5-
import com.commercetools.importapi.models.productvariants.ProductVariantImport;
4+
import static com.commercetools.sdk.CommonImportUtil.importAssets;
5+
import static com.commercetools.sdk.ProductUtil.toImportImages;
66

77
import java.util.stream.Collectors;
88

9-
import static com.commercetools.sdk.CommonImportUtil.importAssets;
10-
import static com.commercetools.sdk.ProductUtil.toImportImages;
9+
import com.commercetools.api.models.product.ProductProjection;
10+
import com.commercetools.api.models.product.ProductVariant;
11+
import com.commercetools.importapi.models.productvariants.ProductVariantImport;
1112

1213
public class ProductVariantUtil {
13-
public ProductVariantImport toProductVariantImport(ProductProjection product, ProductVariant variant, String productKey) {
14+
public ProductVariantImport toProductVariantImport(ProductProjection product, ProductVariant variant,
15+
String productKey) {
1416
return ProductVariantImport.builder()
1517
.key(variant.getKey()) // required field
1618
.sku(variant.getSku())
1719
.isMasterVariant(variant.getId().equals(product.getMasterVariant().getId())) // required field
18-
.attributes(variant.getAttributes().stream()
19-
.map(ProductUtil::mapAttribute)
20-
.collect(Collectors.toList()))
20+
.attributes(
21+
variant.getAttributes().stream().map(ProductUtil::mapAttribute).collect(Collectors.toList()))
2122
.images(toImportImages(variant.getImages()))
2223
.assets(importAssets(variant.getAssets()))
2324
.product(p -> p.key(productKey)) // required field

0 commit comments

Comments
 (0)