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

Polish RSocket server support

Browse Source 
Relax the `NettyRSocketBootstrap` contract to allow all types of
`SocketAcceptor` implementations.

See gh-16021
This commit is contained in:
Brian Clozel
2019-04-11 20:52:49 +02:00
parent 2112e02eda
commit 9eb7260699
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
View File

@@ -20,6 +20,7 @@ import java.util.stream.Collectors;
import io.netty.buffer.PooledByteBufAllocator;
import io.rsocket.RSocketFactory;
import io.rsocket.SocketAcceptor;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -106,9 +107,8 @@ public class RSocketServerAutoConfiguration {
@Bean
public NettyRSocketBootstrap nettyRSocketBootstrap(
RSocketServerFactory rSocketServerFactory,
MessageHandlerAcceptor messageHandlerAcceptor) {
return new NettyRSocketBootstrap(rSocketServerFactory,
messageHandlerAcceptor);
SocketAcceptor socketAcceptor) {
return new NettyRSocketBootstrap(rSocketServerFactory, socketAcceptor);
}
}

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketBootstrap.java
View File

@@ -16,13 +16,14 @@
package org.springframework.boot.rsocket.netty;
import io.rsocket.SocketAcceptor;
import org.springframework.boot.rsocket.context.RSocketServerInitializedEvent;
import org.springframework.boot.rsocket.server.RSocketServer;
import org.springframework.boot.rsocket.server.RSocketServerFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.SmartLifecycle;
import org.springframework.messaging.rsocket.MessageHandlerAcceptor;
/**
* Bootstrap an {@link RSocketServer} and start it with the application context.
@@ -38,8 +39,8 @@ public class NettyRSocketBootstrap
private ApplicationEventPublisher applicationEventPublisher;
public NettyRSocketBootstrap(RSocketServerFactory serverFactoryProvider,
MessageHandlerAcceptor messageHandlerAcceptorProvider) {
this.rSocketServer = serverFactoryProvider.create(messageHandlerAcceptorProvider);
SocketAcceptor socketAcceptor) {
this.rSocketServer = serverFactoryProvider.create(socketAcceptor);
}
@Override