Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename {client|server}Acceptor to Responder

Browse Source 
See gh-23170
This commit is contained in:
Rossen Stoyanchev
2019-07-13 10:23:46 +01:00
parent 3cf5db6317
commit 68c99dafcf
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
View File

@@ -125,7 +125,7 @@ final class DefaultRSocketRequesterBuilder implements RSocketRequester.Builder {
messageHandler.setHandlers(this.handlers); messageHandler.setHandlers(this.handlers);
messageHandler.setRSocketStrategies(rsocketStrategies); messageHandler.setRSocketStrategies(rsocketStrategies);
messageHandler.afterPropertiesSet(); messageHandler.afterPropertiesSet();
rsocketFactory.acceptor(messageHandler.clientAcceptor()); rsocketFactory.acceptor(messageHandler.clientResponder());
} }
rsocketFactory.frameDecoder(PayloadDecoder.ZERO_COPY); rsocketFactory.frameDecoder(PayloadDecoder.ZERO_COPY);
this.factoryConfigurers.forEach(consumer -> consumer.accept(rsocketFactory)); this.factoryConfigurers.forEach(consumer -> consumer.accept(rsocketFactory));

6
spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
View File

@@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
* Extension of {@link MessageMappingMessageHandler} to use as an RSocket * Extension of {@link MessageMappingMessageHandler} to use as an RSocket
* responder by handling incoming streams via {@code @MessageMapping} annotated * responder by handling incoming streams via {@code @MessageMapping} annotated
* methods. * methods.
* <p>Use {@link #clientAcceptor()} and {@link #serverAcceptor()} to obtain * <p>Use {@link #clientResponder()} and {@link #serverResponder()} to obtain
* {@link io.rsocket.RSocketFactory.ClientRSocketFactory#acceptor(Function) client} or * {@link io.rsocket.RSocketFactory.ClientRSocketFactory#acceptor(Function) client} or
* {@link io.rsocket.RSocketFactory.ServerRSocketFactory#acceptor(SocketAcceptor) server} * {@link io.rsocket.RSocketFactory.ServerRSocketFactory#acceptor(SocketAcceptor) server}
* side adapters. * side adapters.
@@ -270,7 +270,7 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
* <p>Subsequent stream requests can be handled with * <p>Subsequent stream requests can be handled with
* {@link MessageMapping MessageMapping} methods. * {@link MessageMapping MessageMapping} methods.
*/ */
public SocketAcceptor serverAcceptor() { public SocketAcceptor serverResponder() {
return (setupPayload, sendingRSocket) -> { return (setupPayload, sendingRSocket) -> {
MessagingRSocket responder = createResponder(setupPayload, sendingRSocket); MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
return responder.handleConnectionSetupPayload(setupPayload).then(Mono.just(responder)); return responder.handleConnectionSetupPayload(setupPayload).then(Mono.just(responder));
@@ -291,7 +291,7 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
* <p>Subsequent stream requests can be handled with * <p>Subsequent stream requests can be handled with
* {@link MessageMapping MessageMapping} methods. * {@link MessageMapping MessageMapping} methods.
*/ */
public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientAcceptor() { public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientResponder() {
return (setupPayload, sendingRSocket) -> { return (setupPayload, sendingRSocket) -> {
MessagingRSocket responder = createResponder(setupPayload, sendingRSocket); MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
responder.handleConnectionSetupPayload(setupPayload).subscribe(); responder.handleConnectionSetupPayload(setupPayload).subscribe();

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
View File

@@ -79,7 +79,7 @@ public class RSocketBufferLeakTests {
server = RSocketFactory.receive() server = RSocketFactory.receive()
.frameDecoder(PayloadDecoder.ZERO_COPY) .frameDecoder(PayloadDecoder.ZERO_COPY)
.addResponderPlugin(payloadInterceptor) // intercept responding .addResponderPlugin(payloadInterceptor) // intercept responding
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor()) .acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
.transport(TcpServerTransport.create("localhost", 7000)) .transport(TcpServerTransport.create("localhost", 7000))
.start() .start()
.block(); .block();

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java
View File

@@ -68,7 +68,7 @@ public class RSocketClientToServerIntegrationTests {
server = RSocketFactory.receive() server = RSocketFactory.receive()
.addResponderPlugin(interceptor) .addResponderPlugin(interceptor)
.frameDecoder(PayloadDecoder.ZERO_COPY) .frameDecoder(PayloadDecoder.ZERO_COPY)
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor()) .acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
.transport(TcpServerTransport.create("localhost", 7000)) .transport(TcpServerTransport.create("localhost", 7000))
.start() .start()
.block(); .block();

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java
View File

@@ -65,7 +65,7 @@ public class RSocketServerToClientIntegrationTests {
server = RSocketFactory.receive() server = RSocketFactory.receive()
.frameDecoder(PayloadDecoder.ZERO_COPY) .frameDecoder(PayloadDecoder.ZERO_COPY)
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor()) .acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
.transport(TcpServerTransport.create("localhost", 0)) .transport(TcpServerTransport.create("localhost", 0))
.start() .start()
.block(); .block();

2
spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt
View File

@@ -202,7 +202,7 @@ class RSocketClientToServerCoroutinesIntegrationTests {
server = RSocketFactory.receive() server = RSocketFactory.receive()
.addResponderPlugin(interceptor) .addResponderPlugin(interceptor)
.frameDecoder(PayloadDecoder.ZERO_COPY) .frameDecoder(PayloadDecoder.ZERO_COPY)
.acceptor(context.getBean(RSocketMessageHandler::class.java).serverAcceptor()) .acceptor(context.getBean(RSocketMessageHandler::class.java).serverResponder())
.transport(TcpServerTransport.create("localhost", 7000)) .transport(TcpServerTransport.create("localhost", 7000))
.start() .start()
.block()!! .block()!!