Merge pull request #244 from commercetools/242-fix-concurrency-issue

242 fix statistics concurrency issue

Author: heshamMassoud

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/commercetools/commercetools-sync-java.svg?branch=master)](https://travis-ci.org/commercetools/commercetools-sync-java)
 [![codecov](https://codecov.io/gh/commercetools/commercetools-sync-java/branch/master/graph/badge.svg)](https://codecov.io/gh/commercetools/commercetools-sync-java)
 [![Download](https://api.bintray.com/packages/commercetools/maven/commercetools-sync-java/images/download.svg) ](https://bintray.com/commercetools/maven/commercetools-sync-java/_latestVersion)
-[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M9/)
+[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M10/)
 [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646)
 
 Java API which exposes utilities for building update actions and automatic syncing of CTP data from external sources 
@@ -21,7 +21,7 @@ Java API which exposes utilities for building update actions and automatic synci
     - [Ivy](#ivy)
 - [Roadmap](#roadmap)
 - [Release Notes](/docs/RELEASE_NOTES.md)
-- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M9/)
+- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M10/)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 ## Usage
@@ -56,20 +56,20 @@ most popular ones:
 <dependency>
   <groupId>com.commercetools</groupId>
   <artifactId>commercetools-sync-java</artifactId>
-  <version>v1.0.0-M9</version>
+  <version>v1.0.0-M10</version>
 </dependency>
 ````
 #### Gradle
 ````groovy
-implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M9'
+implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M10'
 ````
 #### SBT 
 ````
-libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M9"
+libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M10"
 ````
 #### Ivy 
 ````xml
-<dependency org="com.commercetools" name="commercetools-sync-java" rev="v1.0.0-M9"/>
+<dependency org="com.commercetools" name="commercetools-sync-java" rev="v1.0.0-M10"/>
 ````
 
 

docs/RELEASE_NOTES.md

@@ -33,6 +33,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
+- [v1.0.0-M10 -  Feb 13, 2018](#v100-m10----feb-13-2018)
 - [v1.0.0-M9 -  Jan 22, 2018](#v100-m9----jan-22-2018)
 - [v1.0.0-M8 -  Dec 29, 2017](#v100-m8----dec-29-2017)
 - [v1.0.0-M7 -  Dec 15, 2017](#v100-m7----dec-15-2017)
@@ -47,14 +48,25 @@
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 <!--
-### v1.0.0-M10 -  Feb 07, 2018
+### v1.0.0-M11 -  Mar 01, 2018
+[Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M10...v1.0.0-M11) |
+[Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M11/) | 
+[Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M11)
+-->
+
+
+### v1.0.0-M10 -  Feb 13, 2018
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M9...v1.0.0-M10) |
 [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M10/) | 
 [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M10)
 
 **New Features** (1)
 - **Commons** - Added [benchmarking setup](/docs/BENCHMARKS.md) for the library on every release. [#155](https://github.com/commercetools/commercetools-sync-java/issues/155)
--->
+
+**Changes** (3)
+- **Commons** - Statistics counters are now of type `AtomicInteger` instead of int to support conccurency. [#242](https://github.com/commercetools/commercetools-sync-java/issues/242)
+- **Category Sync** - `categoryKeysWithMissingParents` in the `CategorySyncStatistics` is now of type `ConcurrentHashMap<String, Set<String>` instead of `Map<String, List<String>`. [#242](https://github.com/commercetools/commercetools-sync-java/issues/242)
+- **Category Sync** - `CategorySyncStatistics` now exposes the methods `removeChildCategoryKeyFromMissingParentsMap`, `getMissingParentKey` and `putMissingParentCategoryChildKey` to support manipulating `categoryKeysWithMissingParents` map. [#242](https://github.com/commercetools/commercetools-sync-java/issues/242)
 
 ### v1.0.0-M9 -  Jan 22, 2018
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M8...v1.0.0-M9) |

docs/usage/CATEGORY_SYNC.md

@@ -83,8 +83,8 @@ streams, would look as follows:
 ```java
 final Logger logger = LoggerFactory.getLogger(MySync.class);
 final CategorySyncOptions categorySyncOptions = CategorySyncOptionsBuilder.of(sphereClient)
-                                                                          .setErrorCallBack(logger::error)
-                                                                          .setWarningCallBack(logger::warn)
+                                                                          .errorCallBack(logger::error)
+                                                                          .warningCallBack(logger::warn)
                                                                           .build();
 ```
 

docs/usage/PRODUCT_SYNC.md

@@ -100,8 +100,8 @@ streams, would look as follows:
  ```java
  final Logger logger = LoggerFactory.getLogger(MySync.class);
  final ProductSyncOptions productsyncOptions = ProductSyncOptionsBuilder.of(sphereClient)
-                                                                        .setErrorCallBack(logger::error)
-                                                                        .setWarningCallBack(logger::warn)
+                                                                        .errorCallBack(logger::error)
+                                                                        .warningCallBack(logger::warn)
                                                                         .build();
  ```
 

gradle-scripts/dependencies.gradle

@@ -1,11 +1,11 @@
 ext{
     commercetoolsJvmSdkVersion = '1.25.0'
-    mockitoVersion = '2.8.9'
+    mockitoVersion = '2.13.0'
     jUnitVersion = '4.12'
-    assertjVersion = '3.6.1'
+    assertjVersion = '3.9.0'
     checkstyleVersion = '7.7'
     pmdVersion = '5.6.1'
-    jacocoVersion = '0.7.9'
+    jacocoVersion = '0.8.0'
     findbugsVersion = '3.0.1'
 }
 

src/integration-test/java/com/commercetools/sync/integration/externalsource/categories/CategorySyncIT.java

@@ -31,6 +31,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -710,14 +711,14 @@ public void syncDrafts_WithDraftWithAMissingParentKey_ShouldNotSyncIt() {
 
         assertThat(syncStatistics).hasValues(2, 2, 0, 0);
 
-        final Map<String, List<String>> categoryKeysWithMissingParents = syncStatistics
+        final Map<String, Set<String>> categoryKeysWithMissingParents = syncStatistics
             .getCategoryKeysWithMissingParents();
         assertThat(categoryKeysWithMissingParents).hasSize(1);
 
-        final List<String> missingParentsChildren = categoryKeysWithMissingParents.get(nonExistingParentKey);
+        final Set<String> missingParentsChildren = categoryKeysWithMissingParents.get(nonExistingParentKey);
         assertThat(missingParentsChildren).hasSize(1);
 
-        final String childrenKeys = missingParentsChildren.get(0);
-        assertThat(childrenKeys).isEqualTo(categoryDraftWithMissingParent.getKey());
+        final String childKey = missingParentsChildren.iterator().next();
+        assertThat(childKey).isEqualTo(categoryDraftWithMissingParent.getKey());
     }
 }

src/integration-test/java/com/commercetools/sync/integration/externalsource/products/utils/ProductUpdateActionUtilsIT.java

@@ -28,6 +28,7 @@
 import static com.commercetools.sync.integration.commons.utils.SphereClientUtils.CTP_TARGET_CLIENT;
 import static com.commercetools.sync.products.ProductSyncMockUtils.PRODUCT_TYPE_RESOURCE_PATH;
 import static com.commercetools.tests.utils.CompletionStageUtil.executeBlocking;
+import static com.commercetools.sync.commons.asserts.statistics.AssertionsForStatistics.assertThat;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ProductUpdateActionUtilsIT {
@@ -87,10 +88,7 @@ public void buildVariantsUpdateActions_shouldUpdateVariants() {
         assertThat(errors).isEmpty();
         assertThat(warnings).isEmpty();
 
-        assertThat(sync.getCreated()).isEqualTo(0);
-        assertThat(sync.getUpdated()).isEqualTo(1);
-        assertThat(sync.getProcessed()).isEqualTo(1);
-        assertThat(sync.getFailed()).isEqualTo(0);
+        assertThat(sync).hasValues(1, 0, 1, 0);
 
         final Product synced = executeBlocking(CTP_TARGET_CLIENT.execute(ProductByKeyGet.of("productToSyncKey")));
         final ProductVariant syncedMasterVariant = synced.getMasterData().getStaged().getMasterVariant();