Skip to content

Commit 6c745bd

Browse files
christophstroblmp911de
authored andcommitted
Switch to Standard UUID representation.
Closes: #3932 Original pull request: #5034
1 parent 2b44607 commit 6c745bd

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ protected boolean autoIndexCreation() {
226226
protected MongoClientSettings mongoClientSettings() {
227227

228228
MongoClientSettings.Builder builder = MongoClientSettings.builder();
229-
builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
229+
builder.uuidRepresentation(UuidRepresentation.STANDARD);
230230
configureClientSettings(builder);
231231
return builder.build();
232232
}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected MongoClientSettings computeClientSetting() {
162162
getOrDefault(port, "" + ServerAddress.defaultPort())));
163163

164164
Builder builder = MongoClientSettings.builder().applyConnectionString(connectionString);
165-
builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
165+
builder.uuidRepresentation(UuidRepresentation.STANDARD);
166166

167167
if (mongoClientSettings != null) {
168168

@@ -291,7 +291,7 @@ protected MongoClientSettings computeClientSetting() {
291291
applySettings(builder::retryWrites, computeSettingsValue(defaultSettings.getRetryWrites(),
292292
mongoClientSettings.getRetryWrites(), connectionString.getRetryWritesValue()));
293293
applySettings(builder::uuidRepresentation,
294-
computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(), UuidRepresentation.JAVA_LEGACY));
294+
computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(), UuidRepresentation.STANDARD));
295295
}
296296

297297
if (!CollectionUtils.isEmpty(credential)) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public class MongoTestUtils {
5454
private static final Environment ENV = new StandardEnvironment();
5555
private static final Duration DEFAULT_TIMEOUT = Duration.ofMillis(10);
5656

57-
public static final String CONNECTION_STRING = "mongodb://127.0.0.1:27017/?replicaSet=rs0&w=majority&uuidrepresentation=javaLegacy";
57+
public static final String CONNECTION_STRING = "mongodb://127.0.0.1:27017/?replicaSet=rs0&w=majority&uuidrepresentation=standard";
5858

59-
private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/?w=majority&uuidrepresentation=javaLegacy";
59+
private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/?w=majority&uuidrepresentation=standard";
6060

6161
private static final Version ANY = new Version(9999, 9999, 9999);
6262

src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ See xref:mongodb/mapping/custom-conversions.adoc[Custom Conversions - Overriding
119119
| native
120120
| `{"bin" : { "$binary" : "AQIDBA==", "$type" : "00" }}`
121121
122-
| `java.util.UUID` (Legacy UUID)
122+
| `java.util.UUID` (Standard UUID)
123123
| native
124-
| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "03" }}`
124+
| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "04" }}`
125125
126126
| `Date`
127127
| native

0 commit comments

Comments
 (0)