Merge pull request #290 from commercetools/101-price

101 price sync support

Author: heshamMassoud

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.jfrog.bintray' version '1.8.3'
+    id 'com.jfrog.bintray' version '1.8.4'
     id 'org.ajoberstar.git-publish' version '1.0.1'
     id 'com.adarshr.test-logger' version '1.3.1'
     id 'org.ajoberstar.grgit' version '2.2.1'
@@ -13,6 +13,7 @@ apply from: "$rootDir/gradle-scripts/package.gradle"
 apply from: "$rootDir/gradle-scripts/java-compile.gradle"
 apply from: "$rootDir/gradle-scripts/repositories.gradle"
 apply from: "$rootDir/gradle-scripts/integration-tests.gradle"
+apply from: "$rootDir/gradle-scripts/test.gradle"
 apply from: "$rootDir/gradle-scripts/benchmark.gradle"
 apply from: "$rootDir/gradle-scripts/test-logger.gradle"
 apply from: "$rootDir/gradle-scripts/dependencies.gradle"

config/checkstyle/checkstyle.xml

@@ -43,7 +43,6 @@
             <property name="ignorePattern"
                       value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
         </module>
-        <module name="AvoidStarImport" />
         <module name="UnusedImports"/>
         <module name="OneTopLevelClass" />
         <module name="NoLineWrap" />
@@ -69,6 +68,12 @@
             <message key="ws.notPreceded"
                      value="WhitespaceAround: ''{0}'' is not preceded with whitespace." />
         </module>
+        <module name="AvoidStarImport">
+            <property name="excludes" value="com.commercetools.sync.products.utils.productvariantupdateactionutils.prices.PriceDraftFixtures,
+            com.commercetools.sync.products.utils.productvariantupdateactionutils.prices.PriceFixtures"/>
+            <property name="allowClassImports" value="false"/>
+            <property name="allowStaticMemberImports" value="false"/>
+        </module>
         <module name="OneStatementPerLine" />
         <module name="MultipleVariableDeclarations" />
         <module name="ArrayTypeStyle" />

docs/RELEASE_NOTES.md

@@ -33,6 +33,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
+- [v1.0.0-M13 -  Jul 26, 2018](#v100-m13----jul-26-2018)
 - [v1.0.0-M12 -  Jun 05, 2018](#v100-m12----jun-05-2018)
 - [v1.0.0-M11 -  Mar 08, 2018](#v100-m11----mar-08-2018)
 - [v1.0.0-M10 -  Feb 13, 2018](#v100-m10----feb-13-2018)
@@ -49,18 +50,46 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-
 <!--
-### v1.0.0-M13 -  Mar 30, 2018
+### v1.0.0-M14 -  Aug 10, 2018
+[Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M13...v1.0.0-M14) |
+[Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M14/) | 
+[Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M14)
+-->
+
+### v1.0.0-M13 -  Jul 26, 2018
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M12...v1.0.0-M13) |
 [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M13/) | 
 [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M13)
--->
+
+**New Features** (6) 
+- **Product Sync** - Support for syncing product prices. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+- **Product Sync** - `ProductSyncUtils#buildActions` now also calculates variants' all price update actions needed. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+- **Product Sync** - `ProductUpdateActionUtils#buildVariantsUpdateActions` now also calculates variants' all price update actions needed. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+- **Product Sync** - Introduced new update action build utility for building all needed update actions between two variants' prices `ProductVariantUpdateActionUtils#buildProductVariantPricesUpdateActions`. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+- **ProductSync** - `PriceReferenceResolver` now resolves prices' CustomerGroup references on prices. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+- **InventoryEntry Sync** - `InventoryReferenceReplacementUtils#replaceInventoriesReferenceIdsWithKeys` now supports replacing channel reference ids with keys. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101)
+
+**Enhancements** (4)
+- **Commons** - Bumped gradle to version [gradle-4.9](https://docs.gradle.org/4.9/release-notes.html).
+- **Commons** - Bumped `com.jfrog.bintray` to 1.8.4.
+- **Commons** - Bumped `mockito` dependency to 2.19.1.
+- **Commons** - Switched to Junit5 using both `junit-jupiter-engine` and `junit-vintage-engine` for backward compatibility.
+
+**Changes** (3)
+- **Product Sync** - Removed redundant `ProductUpdateActionUtils#buildRemoveVariantUpdateActions`. [#3](https://github.com/commercetools/commercetools-sync-java/issues/3)
+- **Commons** - Moved `SyncUtils#replaceCustomTypeIdWithKeys` to `CustomTypeReferenceReplacementUtils#replaceCustomTypeIdWithKeys`. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101).
+- **Commons** - Moved `SyncUtils#replaceAssetsReferencesIdsWithKeys` to `AssetReferenceReplacementUtils#replaceAssetsReferencesIdsWithKeys`. [#101](https://github.com/commercetools/commercetools-sync-java/issues/101).
+
+
 
 ### v1.0.0-M12 -  Jun 05, 2018
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M11...v1.0.0-M12) |
 [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M12/) | 
 [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M12)
+
+**Enhancements** (13)
+- **Product Sync** - Support for syncing price custom fields. [#277](https://github.com/commercetools/commercetools-sync-java/issues/277)
 - **Product Sync** - `VariantReferenceResolver` now resolves prices' custom type references on all variants. [#277](https://github.com/commercetools/commercetools-sync-java/issues/277)
 - **Product Sync** - `ProductReferenceReplacementUtils#buildProductQuery` now expands custom types on prices. [#277](https://github.com/commercetools/commercetools-sync-java/issues/277)
 - **Product Sync** - `VariantReferenceReplacementUtils#replacePricesReferencesIdsWithKeys` now supports replacing price custom reference ids with keys. [#277](https://github.com/commercetools/commercetools-sync-java/issues/277)
@@ -270,7 +299,7 @@ to JSON parsing not throwing exception on parsing it to reference set. [#179](ht
 - **ProductSync** - Introduced Product State reference resolution and syncing. [#120](https://github.com/commercetools/commercetools-sync-java/issues/120).
 - **ProductSync** - Exposed `ProductReferenceReplacementUtils#buildProductQuery` util to create a product query with all needed reference expansions to fetch products from a source CTP project for the sync. [#120](https://github.com/commercetools/commercetools-sync-java/issues/120).
 - **ProductSync** - Exposed `VariantReferenceReplacementUtils#replaceVariantsReferenceIdsWithKeys` which provides utils to replace reference ids with keys on variants (price and attriute references) coming from a source CTP project to make it ready for reference resolution. [#160](https://github.com/commercetools/commercetools-sync-java/issues/160).
-- **ProductSync** - Exposed `VariantReferenceResolver` which is a helper that resolves the price and attriute references on a ProductVariantDraft. (Note: This is used now by the already existing ProductReferenceResolver) [#160](https://github.com/commercetools/commercetools-sync-java/issues/160).
+- **ProductSync** - Exposed `VariantReferenceResolver` which is a helper that resolves the price and attribute references on a ProductVariantDraft. (Note: This is used now by the already existing ProductReferenceResolver) [#160](https://github.com/commercetools/commercetools-sync-java/issues/160).
 - **CategorySync** - Exposed `CategoryReferenceReplacementUtils#buildCategoryQuery` util to create a category query with all needed reference expansions to fetch categories from a source CTP project for the sync. [#120](https://github.com/commercetools/commercetools-sync-java/issues/120).
 - **Commons** - Exposed `replaceCustomTypeIdWithKeys` and `replaceReferenceIdWithKey`. [#120](https://github.com/commercetools/commercetools-sync-java/issues/120).
 

gradle-scripts/dependencies.gradle

@@ -1,7 +1,7 @@
 ext{
     commercetoolsJvmSdkVersion = '1.33.0'
-    mockitoVersion = '2.19.0'
-    jUnitVersion = '4.12'
+    mockitoVersion = '2.19.1'
+    jupiterApiVersion = '5.2.0'
     assertjVersion = '3.10.0'
     checkstyleVersion = '8.10.1'
     pmdVersion = '5.8.1'
@@ -15,6 +15,9 @@ dependencies {
     implementation "com.commercetools.sdk.jvm.core:commercetools-convenience:${commercetoolsJvmSdkVersion}"
     implementation "com.google.code.findbugs:annotations:${findbugsVersion}"
     testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-    testImplementation "junit:junit:${jUnitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterApiVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${jupiterApiVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jupiterApiVersion}"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${jupiterApiVersion}"
     testImplementation "org.assertj:assertj-core:${assertjVersion}"
 }

gradle-scripts/integration-tests.gradle

@@ -11,9 +11,13 @@ sourceSets {
 
 configurations {
     integrationTestImplementation.extendsFrom implementation, testImplementation
+    integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
 }
 
 task integrationTest(type: Test) {
+    useJUnitPlatform {
+        includeEngines 'junit-jupiter', 'junit-vintage'
+    }
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
     outputs.upToDateWhen { false }

gradle-scripts/test.gradle

@@ -0,0 +1,6 @@
+test {
+    useJUnitPlatform {
+        includeEngines 'junit-jupiter', 'junit-vintage'
+    }
+
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -31,10 +31,10 @@
 import static com.commercetools.sync.benchmark.BenchmarkUtils.calculateDiff;
 import static com.commercetools.sync.benchmark.BenchmarkUtils.saveNewResult;
 import static com.commercetools.sync.commons.asserts.statistics.AssertionsForStatistics.assertThat;
+import static com.commercetools.sync.integration.commons.utils.ChannelITUtils.deleteChannels;
 import static com.commercetools.sync.integration.commons.utils.ITUtils.deleteTypes;
 import static com.commercetools.sync.integration.commons.utils.SphereClientUtils.CTP_TARGET_CLIENT;
 import static com.commercetools.sync.integration.inventories.utils.InventoryITUtils.deleteInventoryEntries;
-import static com.commercetools.sync.integration.inventories.utils.InventoryITUtils.deleteSupplyChannels;
 import static com.commercetools.tests.utils.CompletionStageUtil.executeBlocking;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -45,14 +45,14 @@ public class InventorySyncBenchmark {
     public void setup() {
         deleteInventoryEntries(CTP_TARGET_CLIENT);
         deleteTypes(CTP_TARGET_CLIENT);
-        deleteSupplyChannels(CTP_TARGET_CLIENT);
+        deleteChannels(CTP_TARGET_CLIENT);
     }
 
     @AfterClass
     public static void tearDown() {
         deleteInventoryEntries(CTP_TARGET_CLIENT);
         deleteTypes(CTP_TARGET_CLIENT);
-        deleteSupplyChannels(CTP_TARGET_CLIENT);
+        deleteChannels(CTP_TARGET_CLIENT);
     }
 
     @Test

src/benchmark/java/com/commercetools/sync/benchmark/InventorySyncBenchmark.java

@@ -0,0 +1,56 @@
+package com.commercetools.sync.integration.commons.utils;
+
+import io.sphere.sdk.channels.Channel;
+import io.sphere.sdk.channels.ChannelDraft;
+import io.sphere.sdk.channels.ChannelDraftBuilder;
+import io.sphere.sdk.channels.commands.ChannelCreateCommand;
+import io.sphere.sdk.channels.commands.ChannelDeleteCommand;
+import io.sphere.sdk.channels.queries.ChannelQuery;
+import io.sphere.sdk.client.SphereClient;
+
+import javax.annotation.Nonnull;
+
+import static com.commercetools.sync.integration.commons.utils.ITUtils.queryAndExecute;
+import static com.commercetools.sync.integration.commons.utils.SphereClientUtils.CTP_SOURCE_CLIENT;
+import static com.commercetools.sync.integration.commons.utils.SphereClientUtils.CTP_TARGET_CLIENT;
+import static com.commercetools.tests.utils.CompletionStageUtil.executeBlocking;
+
+public final class ChannelITUtils {
+    /**
+     * Deletes all Channels from CTP projects defined by the {@code CTP_SOURCE_CLIENT} and
+     * {@code CTP_TARGET_CLIENT}.
+     */
+    public static void deleteChannelsFromTargetAndSource() {
+        deleteChannels(CTP_TARGET_CLIENT);
+        deleteChannels(CTP_SOURCE_CLIENT);
+    }
+
+    /**
+     * Deletes all Channels from the CTP project defined by the {@code ctpClient}.
+     *
+     * @param ctpClient defines the CTP project to delete the Channels from.
+     */
+    public static void deleteChannels(@Nonnull final SphereClient ctpClient) {
+        queryAndExecute(ctpClient, ChannelQuery.of(), ChannelDeleteCommand::of);
+    }
+
+    /**
+     * Creates a {@link Channel} in the CTP project defined by the {@code ctpClient} in a blocking fashion.
+     *
+     * @param ctpClient defines the CTP project to create the Channels in.
+     * @param name      the name of the channel to create.
+     * @param key       the key of the channel to create.
+     * @return the created Channel.
+     */
+    public static Channel createChannel(@Nonnull final SphereClient ctpClient, @Nonnull final String name,
+                                        @Nonnull final String key) {
+        final ChannelDraft channelDraft = ChannelDraftBuilder.of(name)
+                                                             .key(key)
+                                                             .build();
+
+        return executeBlocking(ctpClient.execute(ChannelCreateCommand.of(channelDraft)));
+    }
+
+    private ChannelITUtils() {
+    }
+}