DATAMONGO-2616 - Short circuit id value assignment in MongoConverter.

christophstrobl · mp911de · commit aaa45578875e · 2020-10-07T11:35:40.000+02:00
Original pull request: #889.
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
@@ -131,6 +131,10 @@ default Object convertId(@Nullable Object id, Class<?> targetType) {
 			return null;
 		}
 
+		if(ClassUtils.isAssignableValue(targetType, id)) {
+			return id;
+		}
+
 		if (ClassUtils.isAssignable(ObjectId.class, targetType)) {
 
 			if (id instanceof String) {

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,10 @@ default Object convertId(@Nullable Object id, Class<?> targetType) {`
`131`	`131`	`return null;`
`132`	`132`	`}`
`133`	`133`
	`134`	`+ if(ClassUtils.isAssignableValue(targetType, id)) {`
	`135`	`+ return id;`
	`136`	`+ }`
	`137`	`+`
`134`	`138`	`if (ClassUtils.isAssignable(ObjectId.class, targetType)) {`
`135`	`139`
`136`	`140`	`if (id instanceof String) {`