Apply unwrapped persistent property equality check to delegate.

We now compare the other object whether it equals the delegate in case UnwrappedMongoPersistentProperty.equals is being called with the MongoPersistentProperty retrieved from a MappingContext.

This ensures that unwrapped properties can be compared to vanilla MongoPersistentProperty instances when checking constructor/creator method correlation of parameters.

Closes #4732

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentProperty.java

@@ -362,6 +362,10 @@ public boolean equals(@Nullable Object obj) {
 			return true;
 		}
 
+		if (obj == delegate) {
+			return true;
+		}
+
 		if (obj == null || getClass() != obj.getClass()) {
 			return false;
 		}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallbackUnitTests.java

@@ -34,6 +34,7 @@
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 
 /**
  * Unit tests for {@link AuditingEntityCallback}.
@@ -43,13 +44,14 @@
 @ExtendWith(MockitoExtension.class)
 public class AuditingEntityCallbackUnitTests {
 
+	private final MongoMappingContext mappingContext = new MongoMappingContext();
+
 	private IsNewAwareAuditingHandler handler;
 	private AuditingEntityCallback callback;
 
 	@BeforeEach
 	void setUp() {
 
-		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.getPersistentEntity(Sample.class);
 
 		handler = spy(new IsNewAwareAuditingHandler(new PersistentEntities(Arrays.asList(mappingContext))));
@@ -105,13 +107,40 @@ void propagatesChangedInstanceToEvent() {
 		assertThat(result).isSameAs(newSample);
 	}
 
+	@Test // GH-4732
+	void shouldApplyAuditingToUnwrappedImmutableObject() {
+
+		WithUnwrapped sample = new WithUnwrapped();
+		sample.auditingData = new MyAuditingData(null, null);
+
+		IsNewAwareAuditingHandler handler = new IsNewAwareAuditingHandler(PersistentEntities.of(mappingContext));
+
+		AuditingEntityCallback listener = new AuditingEntityCallback(() -> handler);
+		WithUnwrapped result = (WithUnwrapped) listener.onBeforeConvert(sample, "foo");
+
+		assertThat(result.auditingData.created).isNotNull();
+		assertThat(result.auditingData.modified).isNotNull();
+	}
+
 	static class Sample {
 
 		@Id String id;
 		@CreatedDate Date created;
 		@LastModifiedDate Date modified;
 	}
 
+	static class WithUnwrapped {
+
+		@Id String id;
+
+		@Unwrapped(onEmpty = Unwrapped.OnEmpty.USE_NULL) MyAuditingData auditingData;
+
+	}
+
+	record MyAuditingData(@CreatedDate Date created, @LastModifiedDate Date modified) {
+
+	}
+
 	private static final class ImmutableSample {
 
 		@Id private final String id;