core: bump failsafe version to 3.2.4 (eclipse-edc#1561)

chenliang613 · Jul 4, 2022 · df1dcd4 · df1dcd4
1 parent a9b1017
commit df1dcd4
Show file tree

Hide file tree

Showing 90 changed files with 174 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ in the detailed section referring to by linking pull requests or issues.
 * Refactor state machine and in-memory persistence (#1511)
 * Token based Authentication can retrieve key from vault (#1537)
 * JWT audience claim check with DID (#1520)
+* Bump `failsafe` library to version 3.2.4 (#1559)
 
 #### Removed
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -336,7 +336,7 @@ if (project.hasProperty("dependency.analysis")) {
                     exclude(
                         // some common dependencies are intentionally exported by core:base for simplicity
                         "com.squareup.okhttp3:okhttp",
-                        "net.jodah:failsafe",
+                        "dev.failsafe:failsafe",
                     )
                 }
                 onUsedTransitiveDependencies {

diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 val awaitility: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 val jupiterVersion: String by project
 val okHttpVersion: String by project
 val bouncycastleVersion: String by project
@@ -33,7 +33,7 @@ dependencies {
     implementation(project(":extensions:dataloading"))
 
     implementation("com.squareup.okhttp3:okhttp:${okHttpVersion}")
-    implementation("net.jodah:failsafe:${jodahFailsafeVersion}")
+    implementation("dev.failsafe:failsafe:${failsafeVersion}")
     implementation("org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}")
 
     testImplementation(project(":extensions:junit"))

diff --git a/core/base/src/main/java/org/eclipse/dataspaceconnector/core/CoreServicesExtension.java b/core/base/src/main/java/org/eclipse/dataspaceconnector/core/CoreServicesExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.core;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import okhttp3.EventListener;
 import okhttp3.OkHttpClient;
 import org.eclipse.dataspaceconnector.core.base.CommandHandlerRegistryImpl;
@@ -158,9 +158,10 @@ public RetryPolicy<?> retryPolicy(ServiceExtensionContext context) {
         var minBackoff = context.getSetting(BACKOFF_MIN_MILLIS, 500);
         var maxBackoff = context.getSetting(BACKOFF_MAX_MILLIS, 10_000);
 
-        return new RetryPolicy<>()
+        return RetryPolicy.builder()
                 .withMaxRetries(maxRetries)
-                .withBackoff(minBackoff, maxBackoff, ChronoUnit.MILLIS);
+                .withBackoff(minBackoff, maxBackoff, ChronoUnit.MILLIS)
+                .build();
     }
 
     @Provider

diff --git a/core/defaults/build.gradle.kts b/core/defaults/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 val awaitility: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 val jupiterVersion: String by project
 val okHttpVersion: String by project
 

diff --git a/extensions/aws/data-plane-s3/build.gradle.kts b/extensions/aws/data-plane-s3/build.gradle.kts
@@ -14,7 +14,7 @@
 
 val okHttpVersion: String by project
 val storageBlobVersion: String by project;
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 
 plugins {
     `java-library`
@@ -25,7 +25,7 @@ dependencies {
     implementation(project(":common:util"))
     implementation(project(":extensions:aws:s3:s3-core"))
 
-    implementation("net.jodah:failsafe:${jodahFailsafeVersion}")
+    implementation("dev.failsafe:failsafe:${failsafeVersion}")
 
     testImplementation(project(":extensions:data-plane:data-plane-framework"))
     testImplementation(testFixtures(project(":extensions:aws:aws-test")))

diff --git a/extensions/aws/s3/s3-core/build.gradle.kts b/extensions/aws/s3/s3-core/build.gradle.kts
@@ -17,12 +17,12 @@ plugins {
 }
 
 val awsVersion: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 
 
 dependencies {
     api(project(":spi"))
-    api("net.jodah:failsafe:${jodahFailsafeVersion}")
+    api("dev.failsafe:failsafe:${failsafeVersion}")
 
     api("software.amazon.awssdk:sts:${awsVersion}")
     api("software.amazon.awssdk:iam:${awsVersion}")

diff --git a/.../src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/AwsProvisionExtension.java b/.../src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/AwsProvisionExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.AwsSecretToken;
 import org.eclipse.dataspaceconnector.aws.s3.core.AwsTemporarySecretToken;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;

diff --git a/...on/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3BucketProvisioner.java b/...on/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3BucketProvisioner.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.AwsTemporarySecretToken;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
@@ -45,9 +45,10 @@ public S3BucketProvisioner(ClientProvider clientProvider, Monitor monitor, Retry
         this.clientProvider = clientProvider;
         this.monitor = monitor;
         this.configuration = configuration;
-        this.retryPolicy = retryPolicy.copy()
+        this.retryPolicy = RetryPolicy.builder(retryPolicy.getConfig())
                 .withMaxRetries(configuration.getMaxRetries())
-                .handle(AwsServiceException.class);
+                .handle(AwsServiceException.class)
+                .build();
     }
 
     @Override

diff --git a/.../src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3DeprovisionPipeline.java b/.../src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3DeprovisionPipeline.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DeprovisionedResource;

diff --git a/...on/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3ProvisionPipeline.java b/...on/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3ProvisionPipeline.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import software.amazon.awssdk.services.iam.IamAsyncClient;

diff --git a/...vision/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3StatusChecker.java b/...vision/src/main/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3StatusChecker.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.aws.s3.core.S3BucketSchema;
 import org.eclipse.dataspaceconnector.spi.EdcException;

diff --git a/...rc/test/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3BucketProvisionerTest.java b/...rc/test/java/org/eclipse/dataspaceconnector/aws/s3/provision/S3BucketProvisionerTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.AwsTemporarySecretToken;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
@@ -68,7 +68,7 @@ void setUp() {
 
         var configuration = new S3BucketProvisionerConfiguration(2, 3600);
 
-        provisioner = new S3BucketProvisioner(clientProvider, mock(Monitor.class), new RetryPolicy<>(), configuration);
+        provisioner = new S3BucketProvisioner(clientProvider, mock(Monitor.class), RetryPolicy.ofDefaults(), configuration);
     }
 
     @Test

diff --git a/.../java/org/eclipse/dataspaceconnector/aws/s3/provision/S3StatusCheckerIntegrationTest.java b/.../java/org/eclipse/dataspaceconnector/aws/s3/provision/S3StatusCheckerIntegrationTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.aws.s3.provision;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.aws.s3.core.ClientProvider;
 import org.eclipse.dataspaceconnector.aws.s3.core.S3BucketSchema;
 import org.eclipse.dataspaceconnector.aws.testfixtures.AbstractS3Test;
@@ -49,7 +49,7 @@ class S3StatusCheckerIntegrationTest extends AbstractS3Test {
 
     @BeforeEach
     void setup() {
-        RetryPolicy<Object> retryPolicy = new RetryPolicy<>().withMaxRetries(3).withBackoff(200, 1000, ChronoUnit.MILLIS);
+        var retryPolicy = RetryPolicy.builder().withMaxRetries(3).withBackoff(200, 1000, ChronoUnit.MILLIS).build();
         ClientProvider providerMock = mock(ClientProvider.class);
         when(providerMock.clientFor(eq(S3AsyncClient.class), anyString())).thenReturn(client);
         checker = new S3StatusChecker(providerMock, retryPolicy);

diff --git a/extensions/azure/blobstorage/blob-core/build.gradle.kts b/extensions/azure/blobstorage/blob-core/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 val storageBlobVersion: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 val jupiterVersion: String by project
 val faker: String by project
 

diff --git a/extensions/azure/blobstorage/blob-provision/build.gradle.kts b/extensions/azure/blobstorage/blob-provision/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 val storageBlobVersion: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 
 
 dependencies {
@@ -26,7 +26,7 @@ dependencies {
 
     implementation("com.azure:azure-storage-blob:${storageBlobVersion}")
 
-    api("net.jodah:failsafe:${jodahFailsafeVersion}")
+    api("dev.failsafe:failsafe:${failsafeVersion}")
 
     testImplementation(testFixtures(project(":extensions:azure:azure-test")))
 

diff --git a/...src/main/java/org/eclipse/dataspaceconnector/provision/azure/AzureProvisionExtension.java b/...src/main/java/org/eclipse/dataspaceconnector/provision/azure/AzureProvisionExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.provision.azure;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureBlobStoreSchema;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureSasToken;
 import org.eclipse.dataspaceconnector.azure.blob.core.api.BlobStoreApi;

diff --git a/...ava/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectContainerStatusChecker.java b/...ava/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectContainerStatusChecker.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.dataspaceconnector.provision.azure.blob;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureBlobStoreSchema;
 import org.eclipse.dataspaceconnector.azure.blob.core.api.BlobStoreApi;
 import org.eclipse.dataspaceconnector.spi.EdcException;

diff --git a/...in/java/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectStorageProvisioner.java b/...in/java/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectStorageProvisioner.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.provision.azure.blob;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureSasToken;
 import org.eclipse.dataspaceconnector.azure.blob.core.api.BlobStoreApi;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
@@ -30,7 +30,7 @@
 import java.time.OffsetDateTime;
 import java.util.concurrent.CompletableFuture;
 
-import static net.jodah.failsafe.Failsafe.with;
+import static dev.failsafe.Failsafe.with;
 
 public class ObjectStorageProvisioner implements Provisioner<ObjectStorageResourceDefinition, ObjectContainerProvisionedResource> {
     private final RetryPolicy<Object> retryPolicy;

diff --git a/.../dataspaceconnector/provision/azure/blob/ObjectContainerStatusCheckerIntegrationTest.java b/.../dataspaceconnector/provision/azure/blob/ObjectContainerStatusCheckerIntegrationTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.provision.azure.blob;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureBlobStoreSchema;
 import org.eclipse.dataspaceconnector.azure.blob.core.api.BlobStoreApiImpl;
 import org.eclipse.dataspaceconnector.azure.testfixtures.AbstractAzureBlobTest;
@@ -45,7 +45,7 @@ class ObjectContainerStatusCheckerIntegrationTest extends AbstractAzureBlobTest
 
     @BeforeEach
     void setUp() {
-        var policy = new RetryPolicy<>().withMaxRetries(1);
+        var policy = RetryPolicy.builder().withMaxRetries(1).build();
         helloTxt = TestUtils.getFileFromResourceName("hello.txt");
         Vault vault = mock(Vault.class);
 

diff --git a/...ava/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectStorageProvisionerTest.java b/...ava/org/eclipse/dataspaceconnector/provision/azure/blob/ObjectStorageProvisionerTest.java
@@ -15,7 +15,7 @@
 package org.eclipse.dataspaceconnector.provision.azure.blob;
 
 import com.azure.storage.blob.models.BlobStorageException;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.azure.blob.core.AzureSasToken;
 import org.eclipse.dataspaceconnector.azure.blob.core.api.BlobStoreApi;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
@@ -44,7 +44,7 @@ class ObjectStorageProvisionerTest {
 
     @BeforeEach
     void setup() {
-        RetryPolicy<Object> retryPolicy = new RetryPolicy<>().withMaxRetries(0);
+        RetryPolicy<Object> retryPolicy = RetryPolicy.builder().withMaxRetries(0).build();
         provisioner = new ObjectStorageProvisioner(retryPolicy, mock(Monitor.class), blobStoreApiMock);
         policy = Policy.Builder.newInstance().build();
     }

diff --git a/extensions/azure/cosmos/assetindex-cosmos/build.gradle.kts b/extensions/azure/cosmos/assetindex-cosmos/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 val cosmosSdkVersion: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 
 dependencies {
     api(project(":spi"))
@@ -26,7 +26,7 @@ dependencies {
     api(project(":extensions:dataloading"))
 
     implementation("com.azure:azure-cosmos:${cosmosSdkVersion}")
-    implementation("net.jodah:failsafe:${jodahFailsafeVersion}")
+    implementation("dev.failsafe:failsafe:${failsafeVersion}")
 
     testImplementation(testFixtures(project(":extensions:azure:azure-test")))
 

diff --git a/...osmos/src/main/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndex.java b/...osmos/src/main/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndex.java
@@ -16,7 +16,7 @@
 
 import com.azure.cosmos.implementation.NotFoundException;
 import com.azure.cosmos.models.SqlQuerySpec;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.assetindex.azure.model.AssetDocument;
 import org.eclipse.dataspaceconnector.azure.cosmos.CosmosDbApi;
 import org.eclipse.dataspaceconnector.dataloading.AssetEntry;
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import static net.jodah.failsafe.Failsafe.with;
+import static dev.failsafe.Failsafe.with;
 
 public class CosmosAssetIndex implements AssetIndex, DataAddressResolver, AssetLoader {
 

diff --git a/.../main/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexExtension.java b/.../main/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.dataspaceconnector.assetindex.azure;
 
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.assetindex.azure.model.AssetDocument;
 import org.eclipse.dataspaceconnector.azure.cosmos.CosmosClientProvider;
 import org.eclipse.dataspaceconnector.azure.cosmos.CosmosDbApiImpl;

diff --git a/...java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexIntegrationTest.java b/...java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexIntegrationTest.java
@@ -18,7 +18,7 @@
 import com.azure.cosmos.CosmosDatabase;
 import com.azure.cosmos.models.CosmosDatabaseResponse;
 import com.azure.cosmos.models.PartitionKey;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.assetindex.azure.model.AssetDocument;
 import org.eclipse.dataspaceconnector.azure.cosmos.CosmosDbApiImpl;
 import org.eclipse.dataspaceconnector.azure.testfixtures.CosmosTestClient;
@@ -82,7 +82,7 @@ void setUp() {
         TypeManager typeManager = new TypeManager();
         typeManager.registerTypes(Asset.class, AssetDocument.class);
         var api = new CosmosDbApiImpl(container, true);
-        assetIndex = new CosmosAssetIndex(api, TEST_PARTITION_KEY, typeManager, new RetryPolicy<>(), mock(Monitor.class));
+        assetIndex = new CosmosAssetIndex(api, TEST_PARTITION_KEY, typeManager, RetryPolicy.ofDefaults(), mock(Monitor.class));
     }
 
     @AfterEach

diff --git a/...s/src/test/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexTest.java b/...s/src/test/java/org/eclipse/dataspaceconnector/assetindex/azure/CosmosAssetIndexTest.java
@@ -16,7 +16,7 @@
 
 import com.azure.cosmos.implementation.NotFoundException;
 import com.azure.cosmos.models.SqlQuerySpec;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.RetryPolicy;
 import org.eclipse.dataspaceconnector.assetindex.azure.model.AssetDocument;
 import org.eclipse.dataspaceconnector.azure.cosmos.CosmosDbApi;
 import org.eclipse.dataspaceconnector.junit.matchers.PredicateMatcher;
@@ -66,7 +66,7 @@ private static AssetDocument createDocument(String id) {
     public void setUp() {
         typeManager = new TypeManager();
         typeManager.registerTypes(AssetDocument.class, Asset.class);
-        retryPolicy = new RetryPolicy<>().withMaxRetries(1);
+        retryPolicy = RetryPolicy.builder().withMaxRetries(1).build();
         api = mock(CosmosDbApi.class);
         assetIndex = new CosmosAssetIndex(api, TEST_PARTITION_KEY, typeManager, retryPolicy, mock(Monitor.class));
     }

diff --git a/extensions/azure/cosmos/contract-definition-store-cosmos/build.gradle.kts b/extensions/azure/cosmos/contract-definition-store-cosmos/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 val cosmosSdkVersion: String by project
-val jodahFailsafeVersion: String by project
+val failsafeVersion: String by project
 
 dependencies {
     api(project(":spi:contract-spi"))
@@ -26,7 +26,7 @@ dependencies {
     api(project(":extensions:dataloading"))
 
     implementation("com.azure:azure-cosmos:${cosmosSdkVersion}")
-    implementation("net.jodah:failsafe:${jodahFailsafeVersion}")
+    implementation("dev.failsafe:failsafe:${failsafeVersion}")
 
 
     testImplementation(testFixtures(project(":extensions:azure:azure-test")))