Skip to content

Commit 215cb0c

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 94334ff + c8cac46 commit 215cb0c

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ eb09ce06943ccb460981afaa6b5ecfd54f8f87e2
3434
cd4bb52247f964cdb924e28f32a6cd888d25ccea
3535
49ffd1c6341f8071336509d025c414de63c1a702
3636
9f889d62530cbe6f83e65e307231ae05e0efe03d
37+
3fcbbbaa899976c15f805febd6864d70d260f830

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
@@ -25,6 +25,7 @@
2525
import com.commercetools.importapi.models.productdrafts.ProductVariantDraftImport;
2626
import com.commercetools.importapi.models.products.ProductImport;
2727
import com.commercetools.importapi.models.productvariants.Attribute;
28+
2829
import org.jetbrains.annotations.NotNull;
2930

3031
public class ProductUtil {
@@ -385,8 +386,6 @@ public static Attribute mapAttribute(com.commercetools.api.models.product.Attrib
385386

386387
public static ProductDiscountKeyReference toProductDiscountKeyReference(
387388
@NotNull ProductDiscountReference discount) {
388-
return ProductDiscountKeyReference.builder()
389-
.key(discount.getId())
390-
.build();
389+
return ProductDiscountKeyReference.builder().key(discount.getId()).build();
391390
}
392391
}

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

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

4+
import static com.commercetools.sdk.CommonImportUtil.getImportApiCustom;
5+
import static com.commercetools.sdk.CommonImportUtil.importApiTypedMoney;
6+
import static com.commercetools.sdk.ProductUtil.toProductDiscountKeyReference;
7+
8+
import java.util.List;
9+
310
import com.commercetools.api.models.channel.ChannelReference;
411
import com.commercetools.api.models.standalone_price.StandalonePrice;
512
import com.commercetools.importapi.models.common.ChannelKeyReference;
613
import com.commercetools.importapi.models.common.DiscountedPrice;
714
import com.commercetools.importapi.models.common.PriceTier;
815
import com.commercetools.importapi.models.standalone_prices.StandalonePriceImport;
916

10-
import java.util.List;
11-
12-
import static com.commercetools.sdk.CommonImportUtil.getImportApiCustom;
13-
import static com.commercetools.sdk.CommonImportUtil.importApiTypedMoney;
14-
import static com.commercetools.sdk.ProductUtil.toProductDiscountKeyReference;
15-
1617
public class StandalonePriceUtil {
1718
public static StandalonePriceImport toStandalonePriceImport(StandalonePrice price) {
1819
return StandalonePriceImport.builder()
@@ -33,7 +34,8 @@ public static StandalonePriceImport toStandalonePriceImport(StandalonePrice pric
3334

3435
private static DiscountedPrice toImportApiDiscountedPrice(
3536
com.commercetools.api.models.common.DiscountedPrice discounted) {
36-
return DiscountedPrice.builder().value(v -> importApiTypedMoney(discounted.getValue(), v))
37+
return DiscountedPrice.builder()
38+
.value(v -> importApiTypedMoney(discounted.getValue(), v))
3739
.discount(toProductDiscountKeyReference(discounted.getDiscount()))
3840
.build();
3941
}

0 commit comments

Comments
 (0)