From bbefb0b37306dcb8802a66cbd9343c1ec1116536 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 5 Aug 2025 13:28:54 +0200
Subject: [PATCH] Polishing.

Align ConnectionString defaulting. Fix broken Javadoc links.

See: #3932
Original pull request: #5034
---
 .../data/mongodb/core/MongoClientFactoryBean.java        | 9 ++++++---
 .../mongodb/core/MongoClientSettingsFactoryBean.java     | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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 d3f4aad48..7c6639630 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
@@ -291,7 +291,8 @@ 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.STANDARD));
+					computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(),
+							connectionString.getUuidRepresentation()));
 		}
 
 		if (!CollectionUtils.isEmpty(credential)) {
@@ -315,13 +316,15 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 		settingsBuilder.accept(value);
 	}
 
-	private <S, T> @Nullable T computeSettingsValue(Function<S, T> function, S defaultValueHolder, S settingsValueHolder,
+	private <S extends @Nullable Object, T extends @Nullable Object> @Nullable T computeSettingsValue(
+			Function<S, T> function, S defaultValueHolder, S settingsValueHolder,
 			@Nullable T connectionStringValue) {
 		return computeSettingsValue(function.apply(defaultValueHolder), function.apply(settingsValueHolder),
 				connectionStringValue);
 	}
 
-	private <T> @Nullable T computeSettingsValue(@Nullable T defaultValue, T fromSettings, @Nullable T fromConnectionString) {
+	private <T extends @Nullable Object> @Nullable T computeSettingsValue(@Nullable T defaultValue,
+			@Nullable T fromSettings, @Nullable T fromConnectionString) {
 
 		boolean fromSettingsIsDefault = ObjectUtils.nullSafeEquals(defaultValue, fromSettings);
 		boolean fromConnectionStringIsDefault = ObjectUtils.nullSafeEquals(defaultValue, fromConnectionString);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java
index 813d3a4a0..32ab12609 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java
@@ -119,7 +119,7 @@ public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoCli
 
 	/**
 	 * @param socketConnectTimeoutMS in msec
-	 * @see com.mongodb.connection.SocketSettings.Builder#connectTimeout(int, TimeUnit)
+	 * @see com.mongodb.connection.SocketSettings.Builder#connectTimeout(long, TimeUnit)
 	 */
 	public void setSocketConnectTimeoutMS(int socketConnectTimeoutMS) {
 		this.socketConnectTimeoutMS = socketConnectTimeoutMS;
@@ -127,7 +127,7 @@ public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoCli
 
 	/**
 	 * @param socketReadTimeoutMS in msec
-	 * @see com.mongodb.connection.SocketSettings.Builder#readTimeout(int, TimeUnit)
+	 * @see com.mongodb.connection.SocketSettings.Builder#readTimeout(long, TimeUnit)
 	 */
 	public void setSocketReadTimeoutMS(int socketReadTimeoutMS) {
 		this.socketReadTimeoutMS = socketReadTimeoutMS;