From 6c745bd3bece810f0965a247cf08a40370d16aaa Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 31 Jul 2025 13:50:18 +0200 Subject: [PATCH] Switch to Standard UUID representation. Closes: #3932 Original pull request: #5034 --- .../data/mongodb/config/MongoConfigurationSupport.java | 2 +- .../data/mongodb/core/MongoClientFactoryBean.java | 4 ++-- .../data/mongodb/test/util/MongoTestUtils.java | 4 ++-- .../antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java index b01827d8c..60c3ca38c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java @@ -226,7 +226,7 @@ public abstract class MongoConfigurationSupport { protected MongoClientSettings mongoClientSettings() { MongoClientSettings.Builder builder = MongoClientSettings.builder(); - builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY); + builder.uuidRepresentation(UuidRepresentation.STANDARD); configureClientSettings(builder); return builder.build(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java index 9210dd85e..d3f4aad48 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java @@ -162,7 +162,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean imp getOrDefault(port, "" + ServerAddress.defaultPort()))); Builder builder = MongoClientSettings.builder().applyConnectionString(connectionString); - builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY); + builder.uuidRepresentation(UuidRepresentation.STANDARD); if (mongoClientSettings != null) { @@ -291,7 +291,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean imp applySettings(builder::retryWrites, computeSettingsValue(defaultSettings.getRetryWrites(), mongoClientSettings.getRetryWrites(), connectionString.getRetryWritesValue())); applySettings(builder::uuidRepresentation, - computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(), UuidRepresentation.JAVA_LEGACY)); + computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(), UuidRepresentation.STANDARD)); } if (!CollectionUtils.isEmpty(credential)) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java index 81634b475..36a9e411b 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java @@ -54,9 +54,9 @@ public class MongoTestUtils { private static final Environment ENV = new StandardEnvironment(); private static final Duration DEFAULT_TIMEOUT = Duration.ofMillis(10); - public static final String CONNECTION_STRING = "mongodb://127.0.0.1:27017/?replicaSet=rs0&w=majority&uuidrepresentation=javaLegacy"; + public static final String CONNECTION_STRING = "mongodb://127.0.0.1:27017/?replicaSet=rs0&w=majority&uuidrepresentation=standard"; - private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/?w=majority&uuidrepresentation=javaLegacy"; + private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/?w=majority&uuidrepresentation=standard"; private static final Version ANY = new Version(9999, 9999, 9999); diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc index 3c2f88e06..121c80d56 100644 --- a/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc +++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc @@ -119,9 +119,9 @@ See xref:mongodb/mapping/custom-conversions.adoc[Custom Conversions - Overriding | native | `{"bin" : { "$binary" : "AQIDBA==", "$type" : "00" }}` -| `java.util.UUID` (Legacy UUID) +| `java.util.UUID` (Standard UUID) | native -| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "03" }}` +| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "04" }}` | `Date` | native