From 926bcbd9a6c7c4803e349b7b4ef6227a52bc833c Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 12 Feb 2026 13:14:12 +0100 Subject: [PATCH] Stop referring to obsolete ListenableFuture in documentation ListenableFuture as deprecated for removal in 6.0 and removed in 7.0. See gh-33808 See gh-33809 See commit cb8ed43be1ba9ab11f17c7a2f74a79f15bd3fb14 Closes gh-36313 --- .../messaging/tcp/reactor/ReactorNettyTcpClient.java | 2 +- .../mvc/method/annotation/ServletInvocableHandlerMethod.java | 2 +- .../web/socket/messaging/WebSocketStompClient.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java index 8be8726134f..a70b13aea3b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java @@ -208,7 +208,7 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ return handleShuttingDownConnectFailure(handler); } - // Report first connect to the ListenableFuture + // Report first connect to the CompletableFuture CompletableFuture<@Nullable Void> connectFuture = new CompletableFuture<>(); extendTcpClient(this.tcpClient, handler) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java index 43ca99f4d18..4be801588c9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java @@ -197,7 +197,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod { * Create a nested ServletInvocableHandlerMethod subclass that returns the * given value (or raises an Exception if the value is one) rather than * actually invoking the controller method. This is useful when processing - * async return values (for example, Callable, DeferredResult, ListenableFuture). + * async return values (for example, Callable, DeferredResult, CompletableFuture). */ ServletInvocableHandlerMethod wrapConcurrentResult(@Nullable Object result) { return new ConcurrentResultHandlerMethod(result, new ConcurrentResultMethodParameter(result)); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java index ded54a9e0ad..77387373850 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java @@ -247,7 +247,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif * @param handshakeHeaders the headers for the WebSocket handshake * @param handler the session handler * @param uriVariables the URI variables to expand into the URL - * @return a {@code ListenableFuture} for access to the session when ready for use + * @return a {@code CompletableFuture} for access to the session when ready for use * @since 6.0 */ public CompletableFuture connectAsync(String url, @Nullable WebSocketHttpHeaders handshakeHeaders,