Skip to content

Commit b0a392f

Browse files
authored
Replace reactor's deprecated API (#1885)
Replace deprecated `subscriberContext()` method with either `deferContextual()` or `contextWrite()` methods.
1 parent 43843bf commit b0a392f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/java/io/lettuce/core/tracing/BraveTracing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ public TraceContext getTraceContext() {
483483
@Override
484484
public Mono<TraceContext> getTraceContextLater() {
485485

486-
return Mono.subscriberContext()
486+
return Mono.deferContextual(Mono::justOrEmpty)
487487
.filter(it -> it.hasKey(Span.class) || it.hasKey(brave.propagation.TraceContext.class)).map(it -> {
488488

489489
if (it.hasKey(Span.class)) {

src/main/java/io/lettuce/core/tracing/Tracing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static Tracing disabled() {
8181
* @return the {@link TraceContextProvider}.
8282
*/
8383
static Mono<TraceContextProvider> getContext() {
84-
return Mono.subscriberContext().filter(c -> c.hasKey(TraceContextProvider.class))
84+
return Mono.deferContextual(Mono::justOrEmpty).filter(c -> c.hasKey(TraceContextProvider.class))
8585
.map(c -> c.get(TraceContextProvider.class));
8686
}
8787

src/test/java/io/lettuce/core/tracing/BraveTracingIntegrationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void reactivePingWithTrace() {
178178

179179
StatefulRedisConnection<String, String> connect = client.connect();
180180
connect.reactive().ping() //
181-
.subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
181+
.contextWrite(it -> it.put(TraceContext.class, trace.context())) //
182182
.as(StepVerifier::create) //
183183
.expectNext("PONG").verifyComplete();
184184

@@ -200,7 +200,7 @@ void reactiveGetAndSetWithTrace() {
200200
StatefulRedisConnection<String, String> connect = client.connect();
201201
connect.reactive().set("foo", "bar") //
202202
.then(connect.reactive().get("foo")) //
203-
.subscriberContext(it -> it.put(TraceContext.class, trace.context())) //
203+
.contextWrite(it -> it.put(TraceContext.class, trace.context())) //
204204
.as(StepVerifier::create) //
205205
.expectNext("bar").verifyComplete();
206206

@@ -224,8 +224,7 @@ void reactiveGetAndSetWithTraceProvider() {
224224

225225
StatefulRedisConnection<String, String> connect = client.connect();
226226
connect.reactive().set("foo", "bar").then(connect.reactive().get("foo"))
227-
.subscriberContext(io.lettuce.core.tracing.Tracing
228-
.withTraceContextProvider(() -> BraveTracing.BraveTraceContext.create(trace.context()))) //
227+
.contextWrite(io.lettuce.core.tracing.Tracing.withTraceContextProvider(() -> BraveTracing.BraveTraceContext.create(trace.context()))) //
229228
.as(StepVerifier::create) //
230229
.expectNext("bar").verifyComplete();
231230

0 commit comments

Comments
 (0)