root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #39989 from christophstrobl 

* gh-39989:
  Polish "Upgrade to MongoDB 5.0"
  Upgrade to MongoDB 5.0

Closes gh-39989
This commit is contained in:
Andy Wilkinson 2024-04-09 10:49:08 +01:00
parent 3699bcfb87 5166942ce7
commit ab0a7c9c06
3 changed files with 4 additions and 7 deletions
Show Stats 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/mongo/MongoReactiveAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -129,10 +129,8 @@ public class MongoReactiveAutoConfiguration {
} }
} }
@SuppressWarnings("deprecation")
private boolean isCustomTransportConfiguration(MongoClientSettings settings) { private boolean isCustomTransportConfiguration(MongoClientSettings settings) {
return settings != null return settings != null && settings.getTransportSettings() != null;
&& (settings.getTransportSettings() != null || settings.getStreamFactoryFactory() != null);
} }
} }

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -230,7 +230,6 @@ class MongoReactiveAutoConfigurationTests {
assertThat(settings.getApplicationName()).isEqualTo("custom-transport-settings"); assertThat(settings.getApplicationName()).isEqualTo("custom-transport-settings");
assertThat(settings.getTransportSettings()) assertThat(settings.getTransportSettings())
.isSameAs(SimpleTransportSettingsCustomizerConfig.transportSettings); .isSameAs(SimpleTransportSettingsCustomizerConfig.transportSettings);
assertThat(settings.getStreamFactoryFactory()).isNull();
}); });
} }

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1286,7 +1286,7 @@ bom {
releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}")
} }
} }
library("MongoDB", "4.11.1") { library("MongoDB", "5.0.0") {
group("org.mongodb") { group("org.mongodb") {
modules = [ modules = [
"bson", "bson",