Merge branch '2.2.x'

Closes gh-19331
2019-12-09 11:58:58 +01:00
parent eb0eb492b4 9136f54a5c
commit 20bebdc07d
3 changed files with 3 additions and 3 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
@@ -96,7 +96,7 @@ class EmbeddedMongoAutoConfigurationTests {
 			features.add(Feature.ONLY_WINDOWS_2008_SERVER);
 		}
 		load("spring.mongodb.embedded.features="
-				+ String.join(", ", features.stream().map(Feature::name).collect(Collectors.toList())));
+				+ features.stream().map(Feature::name).collect(Collectors.joining(", ")));
 		assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures())
 				.containsExactlyElementsOf(features);
 	}