From 7f9aa39748f5a3dfea3fcf8d151f25e36a181945 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 9 Sep 2025 18:45:04 +0200 Subject: [PATCH] Polishing --- .../reactive/socket/adapter/JettyWebSocketHandlerAdapter.java | 1 - .../web/reactive/socket/adapter/JettyWebSocketSession.java | 4 +++- .../socket/adapter/jetty/JettyWebSocketHandlerAdapter.java | 2 ++ .../web/socket/adapter/jetty/JettyWebSocketSession.java | 4 +--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java index b481b0ddd4e..3250f9e2b50 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java @@ -117,7 +117,6 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { private final Callback callback; - public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) { Assert.notNull(delegate, "'delegate` must not be null"); Assert.notNull(callback, "Callback must not be null"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java index 1cd01bd222d..93591e20a35 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java @@ -68,6 +68,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { @Nullable private final Sinks.Empty handlerCompletionSink; + public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) { this(session, info, factory, null); } @@ -107,6 +108,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { }); } + void handleMessage(WebSocketMessage message) { Assert.state(this.sink != null, "No sink available"); this.sink.next(message); @@ -189,7 +191,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } protected Mono sendMessage(WebSocketMessage message) { - Callback.Completable completable = new Callback.Completable(); DataBuffer dataBuffer = message.getPayload(); Session session = getDelegate(); @@ -245,4 +246,5 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } return Mono.fromFuture(completable); } + } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java index 1b93964d00a..c6eecc030a3 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java @@ -58,6 +58,7 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { this.wsSession = wsSession; } + @Override public void onWebSocketOpen(Session session) { try { @@ -147,4 +148,5 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener { } } } + } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java index ad697d7c405..aeeaa943ce7 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java @@ -173,7 +173,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { return getNativeSession().isOpen(); } - @Override public void initializeNativeSession(Session session) { super.initializeNativeSession(session); @@ -213,7 +212,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { return Collections.emptyList(); } - @Override protected void sendTextMessage(TextMessage message) throws IOException { useSession((session, callback) -> session.sendText(message.getPayload(), callback)); @@ -247,7 +245,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } catch (ExecutionException ex) { Throwable cause = ex.getCause(); - if (cause instanceof IOException ioEx) { throw ioEx; } @@ -263,6 +260,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { } } + @FunctionalInterface private interface SessionConsumer {