Skip to content

Commit 68c99da

Browse files
committed
Rename {client|server}Acceptor to Responder
See gh-23170
1 parent 3cf5db6 commit 68c99da

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private Mono<RSocketRequester> doConnect(ClientTransport transport) {
125125
messageHandler.setHandlers(this.handlers);
126126
messageHandler.setRSocketStrategies(rsocketStrategies);
127127
messageHandler.afterPropertiesSet();
128-
rsocketFactory.acceptor(messageHandler.clientAcceptor());
128+
rsocketFactory.acceptor(messageHandler.clientResponder());
129129
}
130130
rsocketFactory.frameDecoder(PayloadDecoder.ZERO_COPY);
131131
this.factoryConfigurers.forEach(consumer -> consumer.accept(rsocketFactory));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* Extension of {@link MessageMappingMessageHandler} to use as an RSocket
5454
* responder by handling incoming streams via {@code @MessageMapping} annotated
5555
* methods.
56-
* <p>Use {@link #clientAcceptor()} and {@link #serverAcceptor()} to obtain
56+
* <p>Use {@link #clientResponder()} and {@link #serverResponder()} to obtain
5757
* {@link io.rsocket.RSocketFactory.ClientRSocketFactory#acceptor(Function) client} or
5858
* {@link io.rsocket.RSocketFactory.ServerRSocketFactory#acceptor(SocketAcceptor) server}
5959
* side adapters.
@@ -270,7 +270,7 @@ protected void handleNoMatch(@Nullable RouteMatcher.Route destination, Message<?
270270
* <p>Subsequent stream requests can be handled with
271271
* {@link MessageMapping MessageMapping} methods.
272272
*/
273-
public SocketAcceptor serverAcceptor() {
273+
public SocketAcceptor serverResponder() {
274274
return (setupPayload, sendingRSocket) -> {
275275
MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
276276
return responder.handleConnectionSetupPayload(setupPayload).then(Mono.just(responder));
@@ -291,7 +291,7 @@ public SocketAcceptor serverAcceptor() {
291291
* <p>Subsequent stream requests can be handled with
292292
* {@link MessageMapping MessageMapping} methods.
293293
*/
294-
public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientAcceptor() {
294+
public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientResponder() {
295295
return (setupPayload, sendingRSocket) -> {
296296
MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
297297
responder.handleConnectionSetupPayload(setupPayload).subscribe();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void setupOnce() {
7979
server = RSocketFactory.receive()
8080
.frameDecoder(PayloadDecoder.ZERO_COPY)
8181
.addResponderPlugin(payloadInterceptor) // intercept responding
82-
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
82+
.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
8383
.transport(TcpServerTransport.create("localhost", 7000))
8484
.start()
8585
.block();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void setupOnce() {
6868
server = RSocketFactory.receive()
6969
.addResponderPlugin(interceptor)
7070
.frameDecoder(PayloadDecoder.ZERO_COPY)
71-
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
71+
.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
7272
.transport(TcpServerTransport.create("localhost", 7000))
7373
.start()
7474
.block();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void setupOnce() {
6565

6666
server = RSocketFactory.receive()
6767
.frameDecoder(PayloadDecoder.ZERO_COPY)
68-
.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
68+
.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
6969
.transport(TcpServerTransport.create("localhost", 0))
7070
.start()
7171
.block();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class RSocketClientToServerCoroutinesIntegrationTests {
202202
server = RSocketFactory.receive()
203203
.addResponderPlugin(interceptor)
204204
.frameDecoder(PayloadDecoder.ZERO_COPY)
205-
.acceptor(context.getBean(RSocketMessageHandler::class.java).serverAcceptor())
205+
.acceptor(context.getBean(RSocketMessageHandler::class.java).serverResponder())
206206
.transport(TcpServerTransport.create("localhost", 7000))
207207
.start()
208208
.block()!!

0 commit comments

Comments
 (0)