From aaa45578875e7192291433718b8841be06d122cc Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@vmware.com>
Date: Tue, 1 Sep 2020 10:26:06 +0200
Subject: [PATCH] DATAMONGO-2616 - Short circuit id value assignment in
 MongoConverter.

Original pull request: #889.
---
 .../data/mongodb/core/convert/MongoConverter.java             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
index c5e447c9c..8358e84e6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
@@ -131,6 +131,10 @@ public interface MongoConverter
 			return null;
 		}
 
+		if(ClassUtils.isAssignableValue(targetType, id)) {
+			return id;
+		}
+
 		if (ClassUtils.isAssignable(ObjectId.class, targetType)) {
 
 			if (id instanceof String) {