Merge branch '2.2.x' into 2.3.x

Closes gh-23328
This commit is contained in:
Phillip Webb
2020-09-16 00:28:29 -07:00

View File

@@ -83,7 +83,9 @@ class NettyRSocketServerFactoryTests {
}
private NettyRSocketServerFactory getFactory() {
return new NettyRSocketServerFactory();
NettyRSocketServerFactory factory = new NettyRSocketServerFactory();
factory.setPort(0);
return factory;
}
@Test
@@ -202,10 +204,12 @@ class NettyRSocketServerFactoryTests {
@Override
public Mono<RSocket> accept(ConnectionSetupPayload setupPayload, RSocket rSocket) {
return Mono.just(new RSocket() {
@Override
public Mono<Payload> requestResponse(Payload payload) {
return Mono.just(DefaultPayload.create(payload));
}
});
}