Skip to content

5065 empty map with document reference #5066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

5065 empty map with document reference #5066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1efdbfe
Add failing tests highlighting the bug
bamapookie Oct 6, 2025
18a1d55
Return empty map instead of null when the property is a map
bamapookie Oct 6, 2025
3338cea
Adding tests for explicitly assigned nulls and repeating conversion t…
bamapookie Oct 16, 2025
7bbe289
Remove specific verify use occurrences and replace with atLeastOnce()
bamapookie Oct 28, 2025
aa213b4
Removed DisplayName annotations
bamapookie Oct 28, 2025
7e18999
Splitting tests that might have side effects into separate tests
bamapookie Oct 28, 2025
852d529
Remove interaction verifications
bamapookie Oct 30, 2025
fbdb746
Duplicated the map tests for lists and sets
bamapookie Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public ReferenceLookupDelegate(
}

if (!result.iterator().hasNext()) {
return null;
return property.isMap() ? Collections.emptyMap() : null;
}

Object resultValue = result.iterator().next();
Expand Down
61 changes: 60 additions & 1 deletion ...est/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.util.Arrays;
import java.util.Collections;
import java.util.Map;

import org.bson.Document;
import org.bson.types.ObjectId;
Expand All @@ -35,6 +36,8 @@
import org.mockito.quality.Strictness;

import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.model.SpELContext;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.DocumentTestUtils;
import org.springframework.data.mongodb.core.MongoExceptionTranslator;
Expand All @@ -43,6 +46,9 @@
import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import org.springframework.data.mongodb.core.mapping.DocumentReference;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;

/**
* Unit tests for {@link DefaultDbRefResolver}.
Expand All @@ -58,6 +64,8 @@ class DefaultDbRefResolverUnitTests {
@Mock MongoDatabase dbMock;
@Mock MongoCollection<Document> collectionMock;
@Mock FindIterable<Document> cursorMock;
@Mock MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@Mock SpELContext spELContext;
private DefaultDbRefResolver resolver;

@BeforeEach
Expand Down Expand Up @@ -91,7 +99,7 @@ void bulkFetchShouldLoadDbRefsCorrectly() {
}

@Test // DATAMONGO-1194
void bulkFetchShouldThrowExceptionWhenUsingDifferntCollectionsWithinSetOfReferences() {
void bulkFetchShouldThrowExceptionWhenUsingDifferentCollectionsWithinSetOfReferences() {

DBRef ref1 = new DBRef("collection-1", new ObjectId());
DBRef ref2 = new DBRef("collection-2", new ObjectId());
Expand Down Expand Up @@ -134,4 +142,55 @@ void bulkFetchContainsDuplicates() {

assertThat(resolver.bulkFetch(Arrays.asList(ref1, ref2))).containsExactly(document, document);
}

@Test // GH-5065
void emptyMapWithDocumentReferenceAnnotationShouldDeserializeToAnEmptyMap() {
DocumentReference documentReference = mock(DocumentReference.class);
when(documentReference.lookup()).thenReturn("{ '_id' : ?#{#target} }");
when(documentReference.sort()).thenReturn("");
when(documentReference.lazy()).thenReturn(false);
MongoPersistentProperty property = mock(MongoPersistentProperty.class);
when(property.isCollectionLike()).thenReturn(false);
when(property.isMap()).thenReturn(true);
when(property.isDocumentReference()).thenReturn(true);
when(property.getDocumentReference()).thenReturn(documentReference);
DocumentReferenceSource source = mock(DocumentReferenceSource.class);
when(source.getTargetSource()).thenReturn(Document.parse("{}"));
ReferenceLookupDelegate lookupDelegate = new ReferenceLookupDelegate(mappingContext, spELContext);

ReferenceResolver.MongoEntityReader entityReader = mock(ReferenceResolver.MongoEntityReader.class);

Object target = resolver.resolveReference(property, source, lookupDelegate, entityReader);

assertThat(target)
.isNotNull()
.isInstanceOf(Map.class);
}

@Test // GH-5065
void lazyLoadedEmptyMapWithDocumentReferenceAnnotationShouldDeserializeToAnEmptyMapWithANonnullValuesProperty() {
DocumentReference documentReference = mock(DocumentReference.class);
when(documentReference.lookup()).thenReturn("{ '_id' : ?#{#target} }");
when(documentReference.sort()).thenReturn("");
when(documentReference.lazy()).thenReturn(true);
MongoPersistentProperty property = mock(MongoPersistentProperty.class);
when(property.isCollectionLike()).thenReturn(false);
when(property.isMap()).thenReturn(true);
when(property.isDocumentReference()).thenReturn(true);
when(property.getDocumentReference()).thenReturn(documentReference);
//noinspection rawtypes,unchecked
when(property.getType()).thenReturn((Class) Map.class);
DocumentReferenceSource source = mock(DocumentReferenceSource.class);
when(source.getTargetSource()).thenReturn(Document.parse("{}"));
ReferenceLookupDelegate lookupDelegate = new ReferenceLookupDelegate(mappingContext, spELContext);

ReferenceResolver.MongoEntityReader entityReader = mock(ReferenceResolver.MongoEntityReader.class);

Object target = resolver.resolveReference(property, source, lookupDelegate, entityReader);

assertThat(target)
.isNotNull()
.isInstanceOf(Map.class)
.asInstanceOf(MAP).values().isNotNull();
}
}
Loading