diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index 2c3864907d..4c4712be5e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -21,7 +21,9 @@ import com.mongodb.MongoClientSettings.Builder; import com.mongodb.connection.TransportSettings; import com.mongodb.reactivestreams.client.MongoClient; import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.IoHandlerFactory; +import io.netty.channel.MultiThreadIoEventLoopGroup; +import io.netty.channel.nio.NioIoHandler; import io.netty.channel.socket.SocketChannel; import reactor.core.publisher.Flux; @@ -86,7 +88,7 @@ public class MongoReactiveAutoConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnClass({ SocketChannel.class, NioEventLoopGroup.class }) + @ConditionalOnClass({ SocketChannel.class, MultiThreadIoEventLoopGroup.class }) static class NettyDriverConfiguration { @Bean @@ -115,7 +117,8 @@ public class MongoReactiveAutoConfiguration { @Override public void customize(Builder builder) { if (!isCustomTransportConfiguration(this.settings.getIfAvailable())) { - NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup(); + IoHandlerFactory ioHandlerFactory = NioIoHandler.newFactory(); + MultiThreadIoEventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(ioHandlerFactory); this.eventLoopGroup = eventLoopGroup; builder.transportSettings(TransportSettings.nettyBuilder().eventLoopGroup(eventLoopGroup).build()); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8f18449e91..1f90034345 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1653,7 +1653,7 @@ bom { releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}") } } - library("Netty", "4.1.119.Final") { + library("Netty", "4.2.0.Final") { prohibit { contains ".Alpha" contains ".Beta"