Browse Source

Polish

pull/1465/head
Rossen Stoyanchev 9 years ago
parent
commit
cea1a0f1ca
  1. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
  2. 10
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
  3. 12
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
  4. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java

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

@ -36,7 +36,7 @@ import org.springframework.web.reactive.socket.WebSocketMessage; @@ -36,7 +36,7 @@ import org.springframework.web.reactive.socket.WebSocketMessage;
import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Spring {@link WebSocketSession} adapter for JSR 356
* Spring {@link WebSocketSession} adapter for a standard Java (JSR 356)
* {@link javax.websocket.Session}.
*
* @author Violeta Georgieva

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

@ -34,16 +34,18 @@ import reactor.core.publisher.MonoProcessor; @@ -34,16 +34,18 @@ import reactor.core.publisher.MonoProcessor;
*/
public class TomcatWebSocketSession extends StandardWebSocketSession {
public TomcatWebSocketSession(Session session, HandshakeInfo info,
DataBufferFactory factory) {
public TomcatWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
super(session, info, factory);
}
public TomcatWebSocketSession(Session session, HandshakeInfo info,
DataBufferFactory factory, MonoProcessor<Void> completionMono) {
public TomcatWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory,
MonoProcessor<Void> completionMono) {
super(session, info, factory, completionMono);
}
@Override
protected boolean canSuspendReceiving() {
return true;

12
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java

@ -114,6 +114,12 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W @@ -114,6 +114,12 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W
});
}
protected StandardWebSocketSession createWebSocketSession(Session session, HandshakeInfo info,
MonoProcessor<Void> completion) {
return new StandardWebSocketSession(session, info, this.bufferFactory, completion);
}
private ClientEndpointConfig createEndpointConfig(Configurator configurator, List<String> subProtocols) {
return ClientEndpointConfig.Builder.create()
.configurator(configurator)
@ -121,15 +127,11 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W @@ -121,15 +127,11 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W
.build();
}
protected StandardWebSocketSession createWebSocketSession(Session session, HandshakeInfo info,
MonoProcessor<Void> completion) {
return new StandardWebSocketSession(session, info, this.bufferFactory, completion);
}
protected DataBufferFactory bufferFactory() {
return this.bufferFactory;
}
private static final class DefaultConfigurator extends Configurator {
private final HttpHeaders requestHeaders;

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java

@ -32,10 +32,12 @@ import reactor.core.publisher.MonoProcessor; @@ -32,10 +32,12 @@ import reactor.core.publisher.MonoProcessor;
*/
public class TomcatWebSocketClient extends StandardWebSocketClient {
@Override
protected StandardWebSocketSession createWebSocketSession(Session session,
HandshakeInfo info, MonoProcessor<Void> completion) {
return new TomcatWebSocketSession(session, info, bufferFactory(), completion);
return new TomcatWebSocketSession(session, info, bufferFactory(), completion);
}
}
Loading…
Cancel
Save