root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Replace use of deprecated ContextSnapshot methods 

See gh-32813
This commit is contained in:
rstoyanchev 2024-06-21 10:55:14 +01:00
parent 0ea7af7465
commit c1250b1898
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import io.micrometer.context.ContextSnapshot;
import io.micrometer.context.ContextSnapshotFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
@ -517,14 +518,16 @@ class ReactiveTypeHandler {
private static class ContextSnapshotHelper {
@SuppressWarnings("deprecation")
private static final ContextSnapshotFactory factory = ContextSnapshotFactory.builder().build();
@SuppressWarnings("ReactiveStreamsUnusedPublisher")
public static Object writeReactorContext(Object returnValue) {
if (Mono.class.isAssignableFrom(returnValue.getClass())) {
ContextSnapshot snapshot = ContextSnapshot.captureAll();
ContextSnapshot snapshot = factory.captureAll();
return ((Mono<?>) returnValue).contextWrite(snapshot::updateContext);
}
else if (Flux.class.isAssignableFrom(returnValue.getClass())) {
ContextSnapshot snapshot = ContextSnapshot.captureAll();
ContextSnapshot snapshot = factory.captureAll();
return ((Flux<?>) returnValue).contextWrite(snapshot::updateContext);
}
else {