Rename spring.data.mongodb.uuid-representation

Closes gh-47052

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

@@ -73,7 +73,7 @@ public final class MongoAutoConfiguration {
 		StandardMongoClientSettingsBuilderCustomizer standardMongoSettingsCustomizer(MongoProperties properties,
 				MongoConnectionDetails connectionDetails) {
 			return new StandardMongoClientSettingsBuilderCustomizer(connectionDetails,
-					properties.getUuidRepresentation());
+					properties.getRepresentation().getUuid());
 		}
 
 	}

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

@@ -104,10 +104,7 @@ public class MongoProperties {
 	 */
 	private @Nullable String replicaSetName;
 
-	/**
-	 * Representation to use when converting a UUID to a BSON binary value.
-	 */
-	private UuidRepresentation uuidRepresentation = UuidRepresentation.STANDARD;
+	private final Representation representation = new Representation();
 
 	private final Ssl ssl = new Ssl();
 
@@ -167,14 +164,6 @@ public class MongoProperties {
 		this.replicaSetName = replicaSetName;
 	}
 
-	public UuidRepresentation getUuidRepresentation() {
-		return this.uuidRepresentation;
-	}
-
-	public void setUuidRepresentation(UuidRepresentation uuidRepresentation) {
-		this.uuidRepresentation = uuidRepresentation;
-	}
-
 	public @Nullable String getUri() {
 		return this.uri;
 	}
@@ -210,10 +199,31 @@ public class MongoProperties {
 		this.additionalHosts = additionalHosts;
 	}
 
+	public Representation getRepresentation() {
+		return this.representation;
+	}
+
 	public Ssl getSsl() {
 		return this.ssl;
 	}
 
+	public static class Representation {
+
+		/**
+		 * Representation to use when converting a UUID to a BSON binary value.
+		 */
+		private UuidRepresentation uuid = UuidRepresentation.STANDARD;
+
+		public UuidRepresentation getUuid() {
+			return this.uuid;
+		}
+
+		public void setUuidRepresentation(UuidRepresentation uuidRepresentation) {
+			this.uuid = uuidRepresentation;
+		}
+
+	}
+
 	public static class Ssl {
 
 		/**

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

@@ -82,7 +82,7 @@ public final class MongoReactiveAutoConfiguration {
 		StandardMongoClientSettingsBuilderCustomizer standardMongoSettingsCustomizer(MongoProperties properties,
 				MongoConnectionDetails connectionDetails) {
 			return new StandardMongoClientSettingsBuilderCustomizer(connectionDetails,
-					properties.getUuidRepresentation());
+					properties.getRepresentation().getUuid());
 		}
 
 	}

module/spring-boot-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -127,7 +127,7 @@
       "name": "spring.data.mongodb.uuid-representation",
       "deprecation": {
         "level": "error",
-        "replacement": "spring.mongodb.uuid-representation",
+        "replacement": "spring.mongodb.representation.uuid",
         "since": "4.0.0"
       }
     },

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

@@ -35,7 +35,7 @@ class MongoPropertiesTests {
 	@Test
 	void defaultUUidRepresentationIsAlignedWithSpringData() {
 		UuidRepresentation springDataDefault = springDataDefaultUuidRepresentation();
-		UuidRepresentation springBootDefault = new MongoProperties().getUuidRepresentation();
+		UuidRepresentation springBootDefault = new MongoProperties().getRepresentation().getUuid();
 		assertThat(springBootDefault).isEqualTo(springDataDefault);
 	}
 

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

@@ -254,7 +254,7 @@ class MongoReactiveAutoConfigurationTests {
 	@Test
 	void uuidRepresentationDefaultsAreAligned() {
 		this.contextRunner.run((context) -> assertThat(getSettings(context).getUuidRepresentation())
-			.isEqualTo(new MongoProperties().getUuidRepresentation()));
+			.isEqualTo(new MongoProperties().getRepresentation().getUuid()));
 	}
 
 	private MongoClientSettings getSettings(ApplicationContext context) {