Merge branch '3.5.x'

Closes gh-46892

Author: wilkinsona

module/spring-boot-mongodb/build.gradle

@@ -49,6 +49,7 @@ dependencies {
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":core:spring-boot-testcontainers")))
+	testImplementation("org.springframework.data:spring-data-mongodb")
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
 	testRuntimeOnly("io.netty:netty-handler")

module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoProperties.java

@@ -114,7 +114,7 @@ public class MongoProperties {
 	/**
 	 * Representation to use when converting a UUID to a BSON binary value.
 	 */
-	private UuidRepresentation uuidRepresentation = UuidRepresentation.JAVA_LEGACY;
+	private UuidRepresentation uuidRepresentation = UuidRepresentation.STANDARD;
 
 	private final Ssl ssl = new Ssl();
 

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java

@@ -260,12 +260,6 @@ public ConnectionString getConnectionString() {
 				.doesNotHaveBean(PropertiesMongoConnectionDetails.class));
 	}
 
-	@Test
-	void uuidRepresentationDefaultsAreAligned() {
-		this.contextRunner.run((context) -> assertThat(getSettings(context).getUuidRepresentation())
-			.isEqualTo(new MongoProperties().getUuidRepresentation()));
-	}
-
 	private MongoClientSettings getSettings(AssertableApplicationContext context) {
 		assertThat(context).hasSingleBean(MongoClient.class);
 		MongoClientImpl client = (MongoClientImpl) context.getBean(MongoClient.class);

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.mongodb.autoconfigure;
+
+import org.bson.UuidRepresentation;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.data.mongodb.config.MongoConfigurationSupport;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link MongoProperties}.
+ *
+ * @author Andy Wilkinson
+ */
+class MongoPropertiesTests {
+
+	@Test
+	void defaultUUidRepresentationIsAlignedWithSpringData() {
+		UuidRepresentation springDataDefault = springDataDefaultUuidRepresentation();
+		UuidRepresentation springBootDefault = new MongoProperties().getUuidRepresentation();
+		assertThat(springBootDefault).isEqualTo(springDataDefault);
+	}
+
+	private UuidRepresentation springDataDefaultUuidRepresentation() {
+		return new MongoConfigurationSupport() {
+
+			@Override
+			protected String getDatabaseName() {
+				return "test";
+			}
+
+			UuidRepresentation defaultUuidRepresentation() {
+				return mongoClientSettings().getUuidRepresentation();
+			}
+
+		}.defaultUuidRepresentation();
+	}
+
+}