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

Fix RSocket module according latest SF

Browse Source 
See https://github.com/spring-projects/spring-framework/issues/23170
This commit is contained in:
Artem Bilan
2019-07-14 12:11:14 -04:00
parent d2a4987bcc
commit ebb22c2ed4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java
View File

@@ -38,7 +38,7 @@ import reactor.core.publisher.Mono;
* <p>
* Note: the {@link RSocketFactory.ClientRSocketFactory#acceptor(java.util.function.Function)}
* in the provided {@link #factoryConfigurer} is overridden with an internal
* {@link IntegrationRSocketMessageHandler#clientAcceptor()}
* {@link IntegrationRSocketMessageHandler#clientResponder()}
* for the proper Spring Integration channel adapter mappings.
*
* @author Artem Bilan
@@ -126,7 +126,7 @@ public class ClientRSocketConnector extends AbstractRSocketConnector {
.dataMimeType(getDataMimeType().toString())
.metadataMimeType(getMetadataMimeType().toString());
this.factoryConfigurer.accept(clientFactory);
clientFactory.acceptor(this.rSocketMessageHandler.clientAcceptor());
clientFactory.acceptor(this.rSocketMessageHandler.clientResponder());
Payload connectPayload = EmptyPayload.INSTANCE;
if (this.connectRoute != null) {
connectPayload = DefaultPayload.create(this.connectData, this.connectRoute);

4
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java
View File

@@ -52,7 +52,7 @@ import reactor.netty.http.server.HttpServer;
* <p>
* Note: the {@link RSocketFactory.ServerRSocketFactory#acceptor(io.rsocket.SocketAcceptor)}
* in the provided {@link #factoryConfigurer} is overridden with an internal
* {@link ServerRSocketMessageHandler#serverAcceptor()}
* {@link ServerRSocketMessageHandler#serverResponder()}
* for the proper Spring Integration channel adapter mappings.
*
* @author Artem Bilan
@@ -131,7 +131,7 @@ public class ServerRSocketConnector extends AbstractRSocketConnector
this.serverMono =
serverFactory
.acceptor(serverRSocketMessageHandler().serverAcceptor())
.acceptor(serverRSocketMessageHandler().serverResponder())
.transport(this.serverTransport)
.start()
.cache();

4
spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java
View File

@@ -119,7 +119,7 @@ public class RSocketOutboundGatewayIntegrationTests {
serverContext = new AnnotationConfigApplicationContext(ServerConfig.class);
server = RSocketFactory.receive()
.frameDecoder(PayloadDecoder.ZERO_COPY)
.acceptor(serverContext.getBean(RSocketMessageHandler.class).serverAcceptor())
.acceptor(serverContext.getBean(RSocketMessageHandler.class).serverResponder())
.transport(TcpServerTransport.create("localhost", 0))
.start()
.block();
@@ -531,7 +531,7 @@ public class RSocketOutboundGatewayIntegrationTests {
.dataMimeType("text/plain")
.metadataMimeType("message/x.rsocket.routing.v0")
.frameDecoder(PayloadDecoder.ZERO_COPY)
.acceptor(messageHandler().clientAcceptor())
.acceptor(messageHandler().clientResponder())
.transport(TcpClientTransport.create("localhost", server.address().getPort()))
.start()
.block();