From a57f0501fb6775ebad16f600208f76252c21778e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 15 Sep 2022 14:20:49 +0200 Subject: [PATCH] Moving away from deprecated code --- .../circuitbreaker/CircuitBreakerIntegrationTests.java | 4 +++- .../instrument/circuitbreaker/CircuitBreakerTests.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java index a6cb0eea7..084745a2c 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java @@ -18,6 +18,8 @@ package org.springframework.cloud.sleuth.instrument.circuitbreaker; import java.util.concurrent.atomic.AtomicReference; +import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; +import io.github.resilience4j.timelimiter.TimeLimiterRegistry; import org.assertj.core.api.BDDAssertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -116,7 +118,7 @@ public abstract class CircuitBreakerIntegrationTests { @Bean Resilience4JCircuitBreakerFactory resilience4JCircuitBreakerFactory() { - return new Resilience4JCircuitBreakerFactory(); + return new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java index 412489331..41ccc9e58 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java @@ -18,6 +18,8 @@ package org.springframework.cloud.sleuth.instrument.circuitbreaker; import java.util.concurrent.atomic.AtomicReference; +import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; +import io.github.resilience4j.timelimiter.TimeLimiterRegistry; import org.assertj.core.api.BDDAssertions; import org.junit.jupiter.api.Test; @@ -38,7 +40,7 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier { try { scopedSpan = tracer.startScopedSpan("start"); // when - Span span = new Resilience4JCircuitBreakerFactory().create("name") + Span span = new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null).create("name") .run(new TraceSupplier<>(tracerTest().tracing().tracer(), tracer::currentSpan)); BDDAssertions.then(span).isNotNull(); @@ -59,7 +61,7 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier { try { scopedSpan = tracer.startScopedSpan("start"); // when - BDDAssertions.thenThrownBy(() -> new Resilience4JCircuitBreakerFactory().create("name") + BDDAssertions.thenThrownBy(() -> new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null).create("name") .run(new TraceSupplier<>(tracerTest().tracing().tracer(), () -> { first.set(tracer.currentSpan()); throw new IllegalStateException("boom");