Skip to content

Commit 7f9aa39

Browse files
committed
Polishing
1 parent c788554 commit 7f9aa39

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ private static final class JettyCallbackDataBuffer implements CloseableDataBuffe
117117

118118
private final Callback callback;
119119

120-
121120
public JettyCallbackDataBuffer(DataBuffer delegate, Callback callback) {
122121
Assert.notNull(delegate, "'delegate` must not be null");
123122
Assert.notNull(callback, "Callback must not be null");

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
6868
@Nullable
6969
private final Sinks.Empty<Void> handlerCompletionSink;
7070

71+
7172
public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
7273
this(session, info, factory, null);
7374
}
@@ -107,6 +108,7 @@ public JettyWebSocketSession(Session session, HandshakeInfo info, DataBufferFact
107108
});
108109
}
109110

111+
110112
void handleMessage(WebSocketMessage message) {
111113
Assert.state(this.sink != null, "No sink available");
112114
this.sink.next(message);
@@ -189,7 +191,6 @@ public Mono<Void> send(Publisher<WebSocketMessage> messages) {
189191
}
190192

191193
protected Mono<Void> sendMessage(WebSocketMessage message) {
192-
193194
Callback.Completable completable = new Callback.Completable();
194195
DataBuffer dataBuffer = message.getPayload();
195196
Session session = getDelegate();
@@ -245,4 +246,5 @@ protected void onCompleteFailure(Throwable cause) {
245246
}
246247
return Mono.fromFuture(completable);
247248
}
249+
248250
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public JettyWebSocketHandlerAdapter(WebSocketHandler webSocketHandler, JettyWebS
5858
this.wsSession = wsSession;
5959
}
6060

61+
6162
@Override
6263
public void onWebSocketOpen(Session session) {
6364
try {
@@ -147,4 +148,5 @@ private void tryCloseWithError(Throwable t) {
147148
}
148149
}
149150
}
151+
150152
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ public boolean isOpen() {
173173
return getNativeSession().isOpen();
174174
}
175175

176-
177176
@Override
178177
public void initializeNativeSession(Session session) {
179178
super.initializeNativeSession(session);
@@ -213,7 +212,6 @@ private List<WebSocketExtension> getExtensions(Session session) {
213212
return Collections.emptyList();
214213
}
215214

216-
217215
@Override
218216
protected void sendTextMessage(TextMessage message) throws IOException {
219217
useSession((session, callback) -> session.sendText(message.getPayload(), callback));
@@ -247,7 +245,6 @@ private void useSession(SessionConsumer sessionConsumer) throws IOException {
247245
}
248246
catch (ExecutionException ex) {
249247
Throwable cause = ex.getCause();
250-
251248
if (cause instanceof IOException ioEx) {
252249
throw ioEx;
253250
}
@@ -263,6 +260,7 @@ else if (cause instanceof UncheckedIOException uioEx) {
263260
}
264261
}
265262

263+
266264
@FunctionalInterface
267265
private interface SessionConsumer {
268266

0 commit comments

Comments
 (0)