Update dependency com.commercetools:commercetools-sync-java to v9.0.3 (…

…#408)
commercetools · Oct 4, 2022 · 4bbbdc2 · 4bbbdc2
1 parent f1afc5f
commit 4bbbdc2
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ ext {
     assertjVersion = '3.23.1'
     pmdVersion = '6.41.0'
     jacocoVersion = '0.8.6'
-    commercetoolsSyncJava = '9.0.1'
+    commercetoolsSyncJava = '9.0.3'
     apacheCliVersion = '1.5.0'
     jupiterApiVersion = '5.9.1'
     asyncHttpClientVersion = '2.12.3'

diff --git a/src/main/java/com/commercetools/project/sync/SyncModuleOption.java b/src/main/java/com/commercetools/project/sync/SyncModuleOption.java
@@ -19,8 +19,8 @@
 import java.util.stream.Stream;
 
 public enum SyncModuleOption {
-  TYPE_SYNC("types", TypeSync.class, Collections.EMPTY_LIST),
-  PRODUCT_TYPE_SYNC("productTypes", ProductTypeSync.class, Collections.EMPTY_LIST),
+  TYPE_SYNC("types", TypeSync.class, Collections.emptyList()),
+  PRODUCT_TYPE_SYNC("productTypes", ProductTypeSync.class, Collections.emptyList()),
   CART_DISCOUNT_SYNC("cartDiscounts", CartDiscountSync.class, Collections.singletonList(TYPE_SYNC)),
   CUSTOM_OBJECT_SYNC("customObjects", CustomObjectSync.class, Collections.emptyList()),
   CATEGORY_SYNC("categories", CategorySync.class, Collections.singletonList(TYPE_SYNC)),

diff --git a/src/main/java/com/commercetools/project/sync/Syncer.java b/src/main/java/com/commercetools/project/sync/Syncer.java
@@ -14,6 +14,7 @@
 import io.sphere.sdk.client.SphereClient;
 import io.sphere.sdk.customobjects.CustomObject;
 import io.sphere.sdk.models.ResourceView;
+import io.sphere.sdk.models.Versioned;
 import io.sphere.sdk.queries.QueryDsl;
 import io.sphere.sdk.queries.QueryPredicate;
 import java.time.Clock;
@@ -55,10 +56,11 @@ public abstract class Syncer<
     RU extends ResourceView,
     RC extends ResourceView<RC, RC>,
     RD,
+    V extends Versioned,
     S extends BaseSyncStatistics,
     O extends BaseSyncOptions<RU, RD, RC>,
     Q extends QueryDsl<RU, Q>,
-    B extends BaseSync<RD, S, O>> {
+    B extends BaseSync<RD, V, S, O>> {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(Syncer.class);
 

diff --git a/src/main/java/com/commercetools/project/sync/SyncerFactory.java b/src/main/java/com/commercetools/project/sync/SyncerFactory.java
@@ -26,6 +26,7 @@
 import com.commercetools.sync.commons.helpers.BaseSyncStatistics;
 import io.sphere.sdk.client.SphereClient;
 import io.sphere.sdk.models.ResourceView;
+import io.sphere.sdk.models.Versioned;
 import io.sphere.sdk.queries.QueryDsl;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -129,10 +130,11 @@ private CompletableFuture<Void> chainSyncExecution(
               ? extends ResourceView,
               ? extends ResourceView<?, ?>,
               ?,
+              ? extends Versioned,
               ? extends BaseSyncStatistics,
               ? extends BaseSyncOptions<?, ?, ?>,
               ? extends QueryDsl<?, ?>,
-              ? extends BaseSync<?, ?, ?>>
+              ? extends BaseSync<?, ?, ?, ?>>
           syncer =
               buildSyncer(
                   syncOptionValue,
@@ -288,10 +290,11 @@ private void closeClients() {
           ? extends ResourceView,
           ? extends ResourceView<?, ?>,
           ?,
+          ? extends Versioned,
           ? extends BaseSyncStatistics,
           ? extends BaseSyncOptions<?, ?, ?>,
           ? extends QueryDsl<?, ?>,
-          ? extends BaseSync<?, ?, ?>>
+          ? extends BaseSync<?, ?, ?, ?>>
       buildSyncer(
           @Nonnull final SyncModuleOption syncModuleOption,
           @Nonnull final String runnerNameOptionValue,
@@ -302,10 +305,11 @@ private void closeClients() {
             ? extends ResourceView,
             ? extends ResourceView<?, ?>,
             ?,
+            ? extends Versioned,
             ? extends BaseSyncStatistics,
             ? extends BaseSyncOptions<?, ?, ?>,
             ? extends QueryDsl<?, ?>,
-            ? extends BaseSync<?, ?, ?>>
+            ? extends BaseSync<?, ?, ?, ?>>
         syncer = null;
 
     switch (syncModuleOption) {

diff --git a/src/main/java/com/commercetools/project/sync/cartdiscount/CartDiscountSyncer.java b/src/main/java/com/commercetools/project/sync/cartdiscount/CartDiscountSyncer.java
@@ -32,6 +32,7 @@ public final class CartDiscountSyncer
         CartDiscount,
         CartDiscount,
         CartDiscountDraft,
+        CartDiscount,
         CartDiscountSyncStatistics,
         CartDiscountSyncOptions,
         CartDiscountQuery,

diff --git a/src/main/java/com/commercetools/project/sync/category/CategorySyncer.java b/src/main/java/com/commercetools/project/sync/category/CategorySyncer.java
@@ -32,6 +32,7 @@ public final class CategorySyncer
         Category,
         Category,
         CategoryDraft,
+        Category,
         CategorySyncStatistics,
         CategorySyncOptions,
         CategoryQuery,

diff --git a/src/main/java/com/commercetools/project/sync/customer/CustomerSyncer.java b/src/main/java/com/commercetools/project/sync/customer/CustomerSyncer.java
@@ -32,6 +32,7 @@ public final class CustomerSyncer
         Customer,
         Customer,
         CustomerDraft,
+        Customer,
         CustomerSyncStatistics,
         CustomerSyncOptions,
         CustomerQuery,

diff --git a/src/main/java/com/commercetools/project/sync/customobject/CustomObjectSyncer.java b/src/main/java/com/commercetools/project/sync/customobject/CustomObjectSyncer.java
@@ -41,6 +41,7 @@ public final class CustomObjectSyncer
         CustomObject<JsonNode>,
         CustomObject<JsonNode>,
         CustomObjectDraft<JsonNode>,
+        CustomObject<JsonNode>,
         CustomObjectSyncStatistics,
         CustomObjectSyncOptions,
         CustomObjectQuery<JsonNode>,

diff --git a/src/main/java/com/commercetools/project/sync/inventoryentry/InventoryEntrySyncer.java b/src/main/java/com/commercetools/project/sync/inventoryentry/InventoryEntrySyncer.java
@@ -33,6 +33,7 @@ public final class InventoryEntrySyncer
         InventoryEntry,
         InventoryEntry,
         InventoryEntryDraft,
+        InventoryEntry,
         InventorySyncStatistics,
         InventorySyncOptions,
         InventoryEntryQuery,

diff --git a/src/main/java/com/commercetools/project/sync/product/ProductSyncer.java b/src/main/java/com/commercetools/project/sync/product/ProductSyncer.java
@@ -47,6 +47,7 @@ public final class ProductSyncer
         ProductProjection,
         Product,
         ProductDraft,
+        ProductProjection,
         ProductSyncStatistics,
         ProductSyncOptions,
         ProductProjectionQuery,

diff --git a/src/main/java/com/commercetools/project/sync/producttype/ProductTypeSyncer.java b/src/main/java/com/commercetools/project/sync/producttype/ProductTypeSyncer.java
@@ -32,6 +32,7 @@ public final class ProductTypeSyncer
         ProductType,
         ProductType,
         ProductTypeDraft,
+        ProductType,
         ProductTypeSyncStatistics,
         ProductTypeSyncOptions,
         ProductTypeQuery,

diff --git a/src/main/java/com/commercetools/project/sync/shoppinglist/ShoppingListSyncer.java b/src/main/java/com/commercetools/project/sync/shoppinglist/ShoppingListSyncer.java
@@ -34,6 +34,7 @@ public final class ShoppingListSyncer
         ShoppingList,
         ShoppingList,
         ShoppingListDraft,
+        ShoppingList,
         ShoppingListSyncStatistics,
         ShoppingListSyncOptions,
         ShoppingListQuery,

diff --git a/src/main/java/com/commercetools/project/sync/state/StateSyncer.java b/src/main/java/com/commercetools/project/sync/state/StateSyncer.java
@@ -29,7 +29,14 @@
 
 public final class StateSyncer
     extends Syncer<
-        State, State, StateDraft, StateSyncStatistics, StateSyncOptions, StateQuery, StateSync> {
+        State,
+        State,
+        StateDraft,
+        State,
+        StateSyncStatistics,
+        StateSyncOptions,
+        StateQuery,
+        StateSync> {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(StateSyncer.class);
 

diff --git a/src/main/java/com/commercetools/project/sync/taxcategory/TaxCategorySyncer.java b/src/main/java/com/commercetools/project/sync/taxcategory/TaxCategorySyncer.java
@@ -37,6 +37,7 @@ public final class TaxCategorySyncer
         TaxCategory,
         TaxCategory,
         TaxCategoryDraft,
+        TaxCategory,
         TaxCategorySyncStatistics,
         TaxCategorySyncOptions,
         TaxCategoryQuery,

diff --git a/src/main/java/com/commercetools/project/sync/type/TypeSyncer.java b/src/main/java/com/commercetools/project/sync/type/TypeSyncer.java
@@ -31,7 +31,7 @@
 
 public final class TypeSyncer
     extends Syncer<
-        Type, Type, TypeDraft, TypeSyncStatistics, TypeSyncOptions, TypeQuery, TypeSync> {
+        Type, Type, TypeDraft, Type, TypeSyncStatistics, TypeSyncOptions, TypeQuery, TypeSync> {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(TypeSyncer.class);