Polish
This commit is contained in:
parent
d8099adc9a
commit
b7c924cac1
|
@ -116,10 +116,9 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
|
|||
protected abstract T read() throws IOException;
|
||||
|
||||
/**
|
||||
* Suspend reading. Defaults to no-op.
|
||||
* Suspend reading, if the underlying API provides such a mechanism.
|
||||
*/
|
||||
protected void suspendReading() {
|
||||
}
|
||||
protected abstract void suspendReading();
|
||||
|
||||
|
||||
// Private methods for use in State...
|
||||
|
|
|
@ -266,6 +266,11 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest {
|
|||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void suspendReading() {
|
||||
// no-op
|
||||
}
|
||||
|
||||
|
||||
private class RequestBodyPublisherReadListener implements ReadListener {
|
||||
|
||||
|
|
|
@ -67,6 +67,11 @@ public class ListenerReadPublisherTests {
|
|||
return mock(DataBuffer.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void suspendReading() {
|
||||
// No-op
|
||||
}
|
||||
|
||||
public int getReadCalls() {
|
||||
return this.readCalls;
|
||||
}
|
||||
|
|
|
@ -150,13 +150,13 @@ public abstract class AbstractListenerWebSocketSession<T> extends AbstractWebSoc
|
|||
protected abstract void resumeReceiving();
|
||||
|
||||
/**
|
||||
* Returns {@code true} if receiving new message(s) is suspended otherwise
|
||||
* {@code false}.
|
||||
* Whether receiving new message(s) is suspended.
|
||||
* <p><strong>Note:</strong> if the underlying WebSocket API does not provide
|
||||
* flow control for receiving messages, and this method should return
|
||||
* {@code false} and {@link #canSuspendReceiving()} should return {@code false}.
|
||||
* @return returns {@code true} if receiving new message(s) is suspended
|
||||
* otherwise {@code false}.
|
||||
* flow control for receiving messages, then this method as well as
|
||||
* {@link #canSuspendReceiving()} should both return {@code false}.
|
||||
* @return returns {@code true} if receiving new message(s) is suspended,
|
||||
* or otherwise {@code false}.
|
||||
* @since 5.0.2
|
||||
*/
|
||||
protected abstract boolean isSuspended();
|
||||
|
||||
|
@ -226,14 +226,15 @@ public abstract class AbstractListenerWebSocketSession<T> extends AbstractWebSoc
|
|||
|
||||
private final class WebSocketReceivePublisher extends AbstractListenerReadPublisher<WebSocketMessage> {
|
||||
|
||||
private volatile Queue<Object> pendingWebSocketMessages = Queues.unbounded().get();
|
||||
private volatile Queue<Object> pendingMessages = Queues.unbounded(Queues.SMALL_BUFFER_SIZE).get();
|
||||
|
||||
|
||||
@Override
|
||||
protected void checkOnDataAvailable() {
|
||||
if (isSuspended()) {
|
||||
resumeReceiving();
|
||||
}
|
||||
if (!pendingWebSocketMessages.isEmpty()) {
|
||||
if (!this.pendingMessages.isEmpty()) {
|
||||
onDataAvailable();
|
||||
}
|
||||
}
|
||||
|
@ -246,7 +247,7 @@ public abstract class AbstractListenerWebSocketSession<T> extends AbstractWebSoc
|
|||
@Override
|
||||
@Nullable
|
||||
protected WebSocketMessage read() throws IOException {
|
||||
return (WebSocketMessage) pendingWebSocketMessages.poll();
|
||||
return (WebSocketMessage) this.pendingMessages.poll();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -258,7 +259,7 @@ public abstract class AbstractListenerWebSocketSession<T> extends AbstractWebSoc
|
|||
}
|
||||
|
||||
void handleMessage(WebSocketMessage webSocketMessage) {
|
||||
this.pendingWebSocketMessages.offer(webSocketMessage);
|
||||
this.pendingMessages.offer(webSocketMessage);
|
||||
onDataAvailable();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,16 +17,15 @@
|
|||
package org.springframework.web.reactive.socket.adapter;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
||||
|
||||
import javax.websocket.Session;
|
||||
|
||||
import org.apache.tomcat.websocket.WsSession;
|
||||
import reactor.core.publisher.MonoProcessor;
|
||||
|
||||
import org.springframework.core.io.buffer.DataBufferFactory;
|
||||
import org.springframework.web.reactive.socket.HandshakeInfo;
|
||||
import org.springframework.web.reactive.socket.WebSocketSession;
|
||||
|
||||
import reactor.core.publisher.MonoProcessor;
|
||||
|
||||
/**
|
||||
* Spring {@link WebSocketSession} adapter for Tomcat's
|
||||
* {@link javax.websocket.Session}.
|
||||
|
@ -35,8 +34,10 @@ import reactor.core.publisher.MonoProcessor;
|
|||
* @since 5.0
|
||||
*/
|
||||
public class TomcatWebSocketSession extends StandardWebSocketSession {
|
||||
|
||||
private static final AtomicIntegerFieldUpdater<TomcatWebSocketSession> SUSPENDED =
|
||||
AtomicIntegerFieldUpdater.newUpdater(TomcatWebSocketSession.class, "suspended");
|
||||
|
||||
private volatile int suspended;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue