From d4301eea78b1db10a5e00a65852f34b9b9a5b48d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Mon, 10 Jun 2024 14:58:07 +0200
Subject: [PATCH] Populate DTO projection properties that are considered
 associations.

We now populate DTO properties whose are identified as associations. While uncommon, as typically entities declare assocations using entities, associations can be identified as types and so these are now considered when populating properties.

Closes #3104
---
 .../convert/DtoInstantiatingConverter.java    |  9 ++-
 .../DtoInstantiatingConverterUnitTests.java   | 73 +++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/springframework/data/convert/DtoInstantiatingConverterUnitTests.java

diff --git a/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java b/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java
index 5d7fb1171..103d36c18 100644
--- a/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java
+++ b/src/main/java/org/springframework/data/convert/DtoInstantiatingConverter.java
@@ -21,6 +21,7 @@ import org.springframework.data.mapping.Parameter;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.SimpleAssociationHandler;
 import org.springframework.data.mapping.SimplePropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.EntityInstantiator;
@@ -96,7 +97,7 @@ public class DtoInstantiatingConverter implements Converter<Object, Object> {
 		PersistentPropertyAccessor<Object> targetAccessor = targetEntity.getPropertyAccessor(dto);
 		InstanceCreatorMetadata<? extends PersistentProperty<?>> creator = targetEntity.getInstanceCreatorMetadata();
 
-		targetEntity.doWithProperties((SimplePropertyHandler) property -> {
+		SimplePropertyHandler simplePropertyHandler = property -> {
 
 			if ((creator != null) && creator.isCreatorParameter(property)) {
 				return;
@@ -104,7 +105,11 @@ public class DtoInstantiatingConverter implements Converter<Object, Object> {
 
 			targetAccessor.setProperty(property,
 					sourceAccessor.getProperty(sourceEntity.getRequiredPersistentProperty(property.getName())));
-		});
+		};
+
+		targetEntity.doWithProperties(simplePropertyHandler);
+		targetEntity.doWithAssociations(
+				(SimpleAssociationHandler) property -> simplePropertyHandler.doWithPersistentProperty(property.getInverse()));
 
 		return dto;
 	}
diff --git a/src/test/java/org/springframework/data/convert/DtoInstantiatingConverterUnitTests.java b/src/test/java/org/springframework/data/convert/DtoInstantiatingConverterUnitTests.java
new file mode 100644
index 000000000..7b919af30
--- /dev/null
+++ b/src/test/java/org/springframework/data/convert/DtoInstantiatingConverterUnitTests.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.convert;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.mapping.context.SampleMappingContext;
+import org.springframework.data.mapping.model.EntityInstantiators;
+
+/**
+ * Unit tests for {@link DtoInstantiatingConverter}.
+ *
+ * @author Mark Paluch
+ */
+class DtoInstantiatingConverterUnitTests {
+
+	@Test // GH- 3104
+	void dtoProjectionShouldConsiderPropertiesAndAssociations() {
+
+		TheOtherThing ref = new TheOtherThing();
+		MyAssociativeEntity entity = new MyAssociativeEntity("1", ref, "foo");
+		DtoInstantiatingConverter converter = new DtoInstantiatingConverter(DtoProjection.class, new SampleMappingContext(),
+				new EntityInstantiators());
+
+		DtoProjection projection = (DtoProjection) converter.convert(entity);
+
+		assertThat(projection.id).isEqualTo("1");
+		assertThat(projection.ref).isSameAs(ref);
+	}
+
+	static class MyAssociativeEntity {
+
+		String id;
+
+		@Reference TheOtherThing ref;
+
+		String somethingElse;
+
+		public MyAssociativeEntity(String id, TheOtherThing ref, String somethingElse) {
+			this.id = id;
+			this.ref = ref;
+			this.somethingElse = somethingElse;
+		}
+	}
+
+	static class DtoProjection {
+
+		String id;
+
+		@Reference TheOtherThing ref;
+	}
+
+	static class TheOtherThing {
+		String id;
+	}
+
+}