From 39cf2e6ba732a113cb111cebb4d10e5da822b854 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Apr 2024 14:01:37 +0000 Subject: [PATCH 1/2] fix(deps): update all --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a399b64d3..643d0354b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'org.ajoberstar.grgit' version '5.2.2' id "com.github.ben-manes.versions" version '0.51.0' id 'ru.vyarus.mkdocs' version '3.0.0' - id "com.github.spotbugs" version "6.0.9" + id "com.github.spotbugs" version "6.0.12" id 'com.diffplug.spotless' version '6.25.0' id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } @@ -48,7 +48,7 @@ dependencies { implementation "org.apache.commons:commons-text:${commonTextVersion}" api "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSdkV2Version}" api 'commons-io:commons-io:2.16.1' - api 'commons-codec:commons-codec:1.16.1' + api 'commons-codec:commons-codec:1.17.0' api 'com.google.code.findbugs:annotations:3.0.1' api 'com.neovisionaries:nv-i18n:1.29' testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiterVersion}" From ad5a627f905c1db4259650fd3d606cc4f6bde4b7 Mon Sep 17 00:00:00 2001 From: lojzatran Date: Mon, 29 Apr 2024 22:56:37 +0200 Subject: [PATCH 2/2] Fix findbugs errors --- .../sync/customers/utils/CustomerCustomActionBuilder.java | 2 ++ src/main/java/com/commercetools/sync/products/SyncFilter.java | 2 +- .../shoppinglists/utils/ShoppingListCustomActionBuilder.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java b/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java index 47456fd46..437cd744d 100644 --- a/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java +++ b/src/main/java/com/commercetools/sync/customers/utils/CustomerCustomActionBuilder.java @@ -4,6 +4,7 @@ import com.commercetools.api.models.customer.CustomerSetCustomTypeActionBuilder; import com.commercetools.api.models.customer.CustomerUpdateAction; import com.commercetools.sync.commons.helpers.GenericCustomActionBuilder; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -18,6 +19,7 @@ private CustomerCustomActionBuilder() { } @Nonnull + @SuppressFBWarnings public static CustomerCustomActionBuilder of() { return builder; } diff --git a/src/main/java/com/commercetools/sync/products/SyncFilter.java b/src/main/java/com/commercetools/sync/products/SyncFilter.java index b783b0eca..628d450fc 100644 --- a/src/main/java/com/commercetools/sync/products/SyncFilter.java +++ b/src/main/java/com/commercetools/sync/products/SyncFilter.java @@ -57,7 +57,7 @@ public static SyncFilter ofBlackList(@Nonnull final ActionGroup... actionGroups) } @Nonnull - public static SyncFilter of() { + public static synchronized SyncFilter of() { defaultSyncFilter = ofNullable(defaultSyncFilter).orElseGet(SyncFilter::new); return defaultSyncFilter; } diff --git a/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java b/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java index 81e403757..490114025 100644 --- a/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java +++ b/src/main/java/com/commercetools/sync/shoppinglists/utils/ShoppingListCustomActionBuilder.java @@ -4,6 +4,7 @@ import com.commercetools.api.models.shopping_list.ShoppingListSetCustomTypeActionBuilder; import com.commercetools.api.models.shopping_list.ShoppingListUpdateAction; import com.commercetools.sync.commons.helpers.GenericCustomActionBuilder; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -19,6 +20,7 @@ private ShoppingListCustomActionBuilder() { } @Nonnull + @SuppressFBWarnings public static ShoppingListCustomActionBuilder of() { return builder; }