Skip to content

Commit ab0a7c9

Browse files
committed
Merge pull request #39989 from christophstrobl
* gh-39989: Polish "Upgrade to MongoDB 5.0" Upgrade to MongoDB 5.0 Closes gh-39989
2 parents 3699bcf + 5166942 commit ab0a7c9

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -129,10 +129,8 @@ public void destroy() {
129129
}
130130
}
131131

132-
@SuppressWarnings("deprecation")
133132
private boolean isCustomTransportConfiguration(MongoClientSettings settings) {
134-
return settings != null
135-
&& (settings.getTransportSettings() != null || settings.getStreamFactoryFactory() != null);
133+
return settings != null && settings.getTransportSettings() != null;
136134
}
137135

138136
}

Diff for: spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -230,7 +230,6 @@ void customizerWithTransportSettingsOverridesAutoConfig() {
230230
assertThat(settings.getApplicationName()).isEqualTo("custom-transport-settings");
231231
assertThat(settings.getTransportSettings())
232232
.isSameAs(SimpleTransportSettingsCustomizerConfig.transportSettings);
233-
assertThat(settings.getStreamFactoryFactory()).isNull();
234233
});
235234
}
236235

Diff for: spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ bom {
12861286
releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}")
12871287
}
12881288
}
1289-
library("MongoDB", "4.11.1") {
1289+
library("MongoDB", "5.0.0") {
12901290
group("org.mongodb") {
12911291
modules = [
12921292
"bson",

0 commit comments

Comments
 (0)