Browse Source

Switch to Standard UUID representation.

Closes: #3932
Original pull request: #5034
pull/5039/head
Christoph Strobl 5 months ago committed by Mark Paluch
parent
commit
6c745bd3be
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
  1. 2
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java
  2. 4
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java
  3. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
  4. 4
      src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc

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

@ -226,7 +226,7 @@ public abstract class MongoConfigurationSupport { @@ -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();
}

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

@ -162,7 +162,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp @@ -162,7 +162,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> 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<MongoClient> imp @@ -291,7 +291,7 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> 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)) {

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

@ -54,9 +54,9 @@ public class MongoTestUtils { @@ -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);

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

@ -119,9 +119,9 @@ See xref:mongodb/mapping/custom-conversions.adoc[Custom Conversions - Overriding @@ -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

Loading…
Cancel
Save