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

Polishing

This commit is contained in:
Juergen Hoeller 2025-09-09 18:45:04 +02:00
parent c788554b1d
commit 7f9aa39748
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
View File

@ -117,7 +117,6 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener {
private final Callback callback; private final Callback callback;
public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) { public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) {
Assert.notNull(delegate, "'delegate` must not be null"); Assert.notNull(delegate, "'delegate` must not be null");
Assert.notNull(callback, "Callback must not be null"); Assert.notNull(callback, "Callback must not be null");

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
View File

@ -68,6 +68,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
@Nullable @Nullable
private final Sinks.Empty<Void> handlerCompletionSink; private final Sinks.Empty<Void> handlerCompletionSink;
public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) { public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
this(session, info, factory, null); this(session, info, factory, null);
} }
@ -107,6 +108,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
}); });
} }
void handleMessage(WebSocketMessage message) { void handleMessage(WebSocketMessage message) {
Assert.state(this.sink != null, "No sink available"); Assert.state(this.sink != null, "No sink available");
this.sink.next(message); this.sink.next(message);
@ -189,7 +191,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
protected Mono<Void> sendMessage(WebSocketMessage message) { protected Mono<Void> sendMessage(WebSocketMessage message) {
Callback.Completable completable = new Callback.Completable(); Callback.Completable completable = new Callback.Completable();
DataBuffer dataBuffer = message.getPayload(); DataBuffer dataBuffer = message.getPayload();
Session session = getDelegate(); Session session = getDelegate();
@ -245,4 +246,5 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
return Mono.fromFuture(completable); return Mono.fromFuture(completable);
} }
} }

2
spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java
View File

@ -58,6 +58,7 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener {
this.wsSession = wsSession; this.wsSession = wsSession;
} }
@Override @Override
public void onWebSocketOpen(Session session) { public void onWebSocketOpen(Session session) {
try { try {
@ -147,4 +148,5 @@ public class JettyWebSocketHandlerAdapter implements Session.Listener {
} }
} }
} }
} }

4
spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
View File

@ -173,7 +173,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
return getNativeSession().isOpen(); return getNativeSession().isOpen();
} }
@Override @Override
public void initializeNativeSession(Session session) { public void initializeNativeSession(Session session) {
super.initializeNativeSession(session); super.initializeNativeSession(session);
@ -213,7 +212,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
return Collections.emptyList(); return Collections.emptyList();
} }
@Override @Override
protected void sendTextMessage(TextMessage message) throws IOException { protected void sendTextMessage(TextMessage message) throws IOException {
useSession((session, callback) -> session.sendText(message.getPayload(), callback)); useSession((session, callback) -> session.sendText(message.getPayload(), callback));
@ -247,7 +245,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
catch (ExecutionException ex) { catch (ExecutionException ex) {
Throwable cause = ex.getCause(); Throwable cause = ex.getCause();
if (cause instanceof IOException ioEx) { if (cause instanceof IOException ioEx) {
throw ioEx; throw ioEx;
} }
@ -263,6 +260,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
} }
} }
@FunctionalInterface @FunctionalInterface
private interface SessionConsumer { private interface SessionConsumer {