From 33e2e68cf22ff4056d094103eb843d17844315cf Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Fri, 14 Nov 2025 13:56:10 +0100
Subject: [PATCH 1/2] After release cleanups.

See #5077

Signed-off-by: Mohammadali Jalalkamali <m.ali.jalalkamali@gmail.com>
---
 pom.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7eaf6a8015..557e1ad29d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.0.0</version>
+		<version>4.1.0-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -26,7 +26,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>4.0.0</springdata.commons>
+		<springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
 		<mongo>5.6.1</mongo>
 		<jmh.version>1.19</jmh.version>
 	</properties>
@@ -157,8 +157,20 @@
 
 
 	<repositories>
-		
-		
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>
 
 </project>

From 9776b35c9b898926c74b852223f0fcbfcc966243 Mon Sep 17 00:00:00 2001
From: Mohammadali Jalalkamali <m.ali.jalalkamali@gmail.com>
Date: Thu, 4 Dec 2025 22:22:44 +0330
Subject: [PATCH 2/2] GH-4873: Use JsonWriterSettings(SHELL) for logging

Signed-off-by: Mohammadali Jalalkamali <m.ali.jalalkamali@gmail.com>
---
 .../core/query/SerializationUtils.java        | 23 +++++++++++++++++--
 .../core/SerializationUtilsUnitTests.java     | 20 ++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
index 29f8adb2c6..b34d175306 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
@@ -23,6 +23,9 @@
 import java.util.Map;
 
 import org.bson.Document;
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriterSettings;
+import org.bson.types.ObjectId;
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.lang.Contract;
@@ -37,6 +40,11 @@
  */
 public abstract class SerializationUtils {
 
+	private static final JsonWriterSettings LOGGING_JSON_SETTINGS =
+			JsonWriterSettings.builder()
+					.outputMode(JsonMode.SHELL)
+					.build();
+
 	private SerializationUtils() {
 
 	}
@@ -118,7 +126,14 @@ private static void toFlatMap(String currentPath, Object source, Map<String, Obj
 		}
 
 		try {
-			String json = value instanceof Document document ? document.toJson() : serializeValue(value);
+			String json;
+
+			if (value instanceof Document document) {
+				json = document.toJson(LOGGING_JSON_SETTINGS);
+			} else {
+				json = serializeValue(value);
+			}
+
 			return json.replaceAll("\":", "\" :").replaceAll("\\{\"", "{ \"");
 		} catch (Exception e) {
 
@@ -140,7 +155,11 @@ public static String serializeValue(@Nullable Object value) {
 			return "null";
 		}
 
-		String documentJson = new Document("toBeEncoded", value).toJson();
+		if (value instanceof ObjectId objectId) {
+			return "ObjectId(\"" + objectId.toHexString() + "\")";
+		}
+
+		String documentJson = new Document("toBeEncoded", value).toJson(LOGGING_JSON_SETTINGS);
 		return documentJson.substring(documentJson.indexOf(':') + 1, documentJson.length() - 1).trim();
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
index 1bf9114967..2cc0c073e8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
@@ -22,6 +22,7 @@
 import java.util.Map;
 
 import org.bson.Document;
+import org.bson.types.ObjectId;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 
@@ -117,6 +118,25 @@ public void flattenMapShouldReturnEmptyMapWhenSourceIsNull() {
 		assertThat(flattenMap(null)).isEmpty();
 	}
 
+	@Test
+	void shouldRenderStandaloneObjectIdInShellFormat() {
+		ObjectId id = new ObjectId("507f1f77bcf86cd799439011");
+		String result = SerializationUtils.serializeValue(id);
+		assertThat(result).isEqualTo("ObjectId(\"507f1f77bcf86cd799439011\")");
+	}
+
+	@Test
+	void shouldRenderDocumentWithObjectIdInShellFormat() {
+		ObjectId id = new ObjectId("507f1f77bcf86cd799439011");
+		Document doc = new Document("_id", id);
+
+		String result = SerializationUtils.serializeToJsonSafely(doc);
+
+		assertThat(result)
+				.contains("ObjectId(\"507f1f77bcf86cd799439011\")")
+				.doesNotContain("\"$oid\"");
+	}
+
 	static class Complex {
 
 	}