From 87ba0c4df8c0a13526bbb8069ac2e90d656c8bf5 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 15 Mar 2024 14:29:06 +0100 Subject: [PATCH] Switch to MongoDB 5.0 driver. Adapt code to no longer available MongoClientSettings#getStreamFactoryFactory method. --- .../autoconfigure/mongo/MongoReactiveAutoConfiguration.java | 4 +--- .../mongo/MongoReactiveAutoConfigurationTests.java | 1 - spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) 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 5426b6f17fc9..e369eda74227 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 @@ -129,10 +129,8 @@ public void destroy() { } } - @SuppressWarnings("deprecation") private boolean isCustomTransportConfiguration(MongoClientSettings settings) { - return settings != null - && (settings.getTransportSettings() != null || settings.getStreamFactoryFactory() != null); + return settings != null && settings.getTransportSettings() != null; } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index df46e4b45933..2a7075b2b800 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -230,7 +230,6 @@ void customizerWithTransportSettingsOverridesAutoConfig() { assertThat(settings.getApplicationName()).isEqualTo("custom-transport-settings"); assertThat(settings.getTransportSettings()) .isSameAs(SimpleTransportSettingsCustomizerConfig.transportSettings); - assertThat(settings.getStreamFactoryFactory()).isNull(); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 87afa5ea5a13..128927f3ff0a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1291,7 +1291,7 @@ bom { releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") } } - library("MongoDB", "4.11.1") { + library("MongoDB", "5.0.0") { group("org.mongodb") { modules = [ "bson",