Merge branch 'master' into master

This commit is contained in:
Loredana Crusoveanu
2023-06-02 16:23:25 +03:00
committed by GitHub
136 changed files with 2488 additions and 618 deletions
@@ -67,10 +67,10 @@
<hibernate-core.version>5.2.16.Final</hibernate-core.version>
<mysql-connector.version>6.0.6</mysql-connector.version>
<spring-boot.version>2.7.5</spring-boot.version>
<rest-assured.version>3.3.0</rest-assured.version>
<rest-assured.version>5.3.0</rest-assured.version>
<spring-boot-starter-integration.version>2.7.5</spring-boot-starter-integration.version>
<spring-integration-test.version>5.5.14</spring-integration-test.version>
<camel-core.version>3.14.0</camel-core.version>
<camel-core.version>3.20.4</camel-core.version>
<camel-test-junit5.version>3.14.0</camel-test-junit5.version>
</properties>
@@ -17,8 +17,13 @@
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
<version>1.7.1</version>
<version>${resilience4j-retry.version}</version>
</dependency>
</dependencies>
<properties>
<resilience4j-retry.version>2.0.2</resilience4j-retry.version>
</properties>
</project>
@@ -1,6 +1,6 @@
package com.baeldung.backoff.jitter;
import io.github.resilience4j.retry.IntervalFunction;
import io.github.resilience4j.core.IntervalFunction;
import io.github.resilience4j.retry.Retry;
import io.github.resilience4j.retry.RetryConfig;
import org.junit.Before;
@@ -15,8 +15,8 @@ import java.util.concurrent.ExecutorService;
import java.util.function.Function;
import static com.baeldung.backoff.jitter.BackoffWithJitterUnitTest.RetryProperties.*;
import static io.github.resilience4j.retry.IntervalFunction.ofExponentialBackoff;
import static io.github.resilience4j.retry.IntervalFunction.ofExponentialRandomBackoff;
import static io.github.resilience4j.core.IntervalFunction.ofExponentialBackoff;
import static io.github.resilience4j.core.IntervalFunction.ofExponentialRandomBackoff;
import static java.util.Collections.nCopies;
import static java.util.concurrent.Executors.newFixedThreadPool;
import static org.mockito.ArgumentMatchers.anyString;