From 4bbbdc29b3430ed88b752c288eff4282370e118b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 17:02:48 +0200 Subject: [PATCH] Update dependency com.commercetools:commercetools-sync-java to v9.0.3 (#408) --- build.gradle | 2 +- .../commercetools/project/sync/SyncModuleOption.java | 4 ++-- .../java/com/commercetools/project/sync/Syncer.java | 4 +++- .../com/commercetools/project/sync/SyncerFactory.java | 10 +++++++--- .../project/sync/cartdiscount/CartDiscountSyncer.java | 1 + .../project/sync/category/CategorySyncer.java | 1 + .../project/sync/customer/CustomerSyncer.java | 1 + .../project/sync/customobject/CustomObjectSyncer.java | 1 + .../sync/inventoryentry/InventoryEntrySyncer.java | 1 + .../project/sync/product/ProductSyncer.java | 1 + .../project/sync/producttype/ProductTypeSyncer.java | 1 + .../project/sync/shoppinglist/ShoppingListSyncer.java | 1 + .../commercetools/project/sync/state/StateSyncer.java | 9 ++++++++- .../project/sync/taxcategory/TaxCategorySyncer.java | 1 + .../commercetools/project/sync/type/TypeSyncer.java | 2 +- 15 files changed, 31 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 0955a2b5..fac7b9a5 100644 --- 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 index 4ab935d4..f0c2bb22 100644 --- 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 index 4582d8d6..a46f9ab6 100644 --- 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, RD, + V extends Versioned, S extends BaseSyncStatistics, O extends BaseSyncOptions, Q extends QueryDsl, - B extends BaseSync> { + B extends BaseSync> { 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 index 264baaa5..c37a860f 100644 --- 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 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 index 0cc7ef44..d6fd5a7d 100644 --- 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 index 94096a50..2cfcc7c6 100644 --- 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 index 09d6f6ce..afef02fc 100644 --- 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 index 59212bc1..69500947 100644 --- 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, CustomObject, CustomObjectDraft, + CustomObject, CustomObjectSyncStatistics, CustomObjectSyncOptions, CustomObjectQuery, diff --git a/src/main/java/com/commercetools/project/sync/inventoryentry/InventoryEntrySyncer.java b/src/main/java/com/commercetools/project/sync/inventoryentry/InventoryEntrySyncer.java index 5ac163e9..f5b23a6b 100644 --- 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 index a0983eb3..de32c2d3 100644 --- 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 index 456cd847..7578c541 100644 --- 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 index 1dd67cff..eac772fa 100644 --- 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 index 0669efbc..e22d6b5b 100644 --- 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 index 445669f9f..7e002f58 100644 --- 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 index 5f1c8d87..a1f61268 100644 --- 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);