Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DocumentReference should consider Reference annotations.

Browse Source 
Closes #3851
Original pull request: #3852.
This commit is contained in:
Christoph Strobl
2021-10-04 10:18:47 +02:00
committed by Mark Paluch
parent 7b05cfad94
commit 4a5789d67e
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
View File

@@ -828,7 +828,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
return;
}
if (prop.isAssociation()) {
if (prop.isAssociation() && prop.isAnnotationPresent(Reference.class)) {
accessor.put(prop, new DocumentPointerFactory(conversionService, mappingContext)
.computePointer(mappingContext, prop, obj, valueType.getType()).getPointer());

19
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
View File

@@ -2614,7 +2614,26 @@ class MappingMongoConverterUnitTests {
ClassWithMapProperty target = converter.read(ClassWithMapProperty.class, source);
assertThat(target.mapOfObjects).containsEntry("simple",1);
}
@Test // GH-3851
void associationMappingShouldFallBackToDefaultIfNoAtReferenceAnnotationPresent/* as done via jmolecules */() {
UUID id = UUID.randomUUID();
Person sourceValue = new Person();
sourceValue.id = id.toString();
DocumentAccessor accessor = new DocumentAccessor(new org.bson.Document());
MongoPersistentProperty persistentProperty = mock(MongoPersistentProperty.class);
when(persistentProperty.isAssociation()).thenReturn(true);
when(persistentProperty.getFieldName()).thenReturn("pName");
doReturn(ClassTypeInformation.from(Person.class)).when(persistentProperty).getTypeInformation();
doReturn(Person.class).when(persistentProperty).getType();
doReturn(Person.class).when(persistentProperty).getRawType();
converter.writePropertyInternal(sourceValue, accessor, persistentProperty);
assertThat(accessor.getDocument()).isEqualTo(new org.bson.Document("pName", new org.bson.Document("_id", id.toString())));
}
static class GenericType<T> {