Skip to content

Commit

Permalink
Fix #self @DocumentReference resolution when used in constructor.
Browse files Browse the repository at this point in the history
This commit enables document reference lookup to use `DocumentReferenceSource` to properly instantiate an entity containig a @DocumentReference `#self` property.

Closes #4484
Original Pull Request: #4486
  • Loading branch information
sxhinzvc authored and christophstrobl committed Aug 31, 2023
1 parent 0b3d1b8 commit f0858fb
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
* @author Roman Puchkovskiy
* @author Heesu Jung
* @author Divya Srivastava
* @author Julia Lee
*/
public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware {

Expand Down Expand Up @@ -1976,8 +1977,9 @@ public <T> T getPropertyValue(MongoPersistentProperty property) {
}

if (property.isDocumentReference()) {
return (T) dbRefResolver.resolveReference(property, accessor.get(property), referenceLookupDelegate,
context::convert);
return (T) dbRefResolver.resolveReference(property,
new DocumentReferenceSource(accessor.getDocument(), accessor.get(property)),
referenceLookupDelegate, context::convert);
}

return super.getPropertyValue(property);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
* {@link DocumentReference} related integration tests for {@link MongoTemplate}.
*
* @author Christoph Strobl
* @author Julia Lee
*/
@ExtendWith(MongoClientExtension.class)
public class MongoTemplateDocumentReferenceTests {
Expand Down Expand Up @@ -1270,6 +1271,32 @@ void readWriteTypeReferenceHavingFixedStringIdTargetType() {
.isEqualTo(new ObjectRefHavingStringIdTargetType(id.toHexString(), "me-the-referenced-object"));
}

@Test // GH-4484
void resolveReferenceForOneToManyLookupWithSelfVariableWhenUsedInCtorArgument() {

OneToManyStylePublisherWithRequiredArgsCtor publisher = new OneToManyStylePublisherWithRequiredArgsCtor("p-100", null);
template.save(publisher);

OneToManyStyleBook book1 = new OneToManyStyleBook();
book1.id = "id-1";
book1.publisherId = publisher.id;

OneToManyStyleBook book2 = new OneToManyStyleBook();
book2.id = "id-2";
book2.publisherId = "p-200";

OneToManyStyleBook book3 = new OneToManyStyleBook();
book3.id = "id-3";
book3.publisherId = publisher.id;

template.save(book1);
template.save(book2);
template.save(book3);

OneToManyStylePublisherWithRequiredArgsCtor target = template.findOne(query(where("id").is(publisher.id)), OneToManyStylePublisherWithRequiredArgsCtor.class);
assertThat(target.books).containsExactlyInAnyOrder(book1, book3);
}

@Data
static class SingleRefRoot {

Expand Down Expand Up @@ -1614,4 +1641,40 @@ public static class WithListOfRefs {

@DocumentReference private List<WithListOfRefs> refs;
}

static class OneToManyStylePublisherWithRequiredArgsCtor {

@Id
String id;

@ReadOnlyProperty
@DocumentReference(lookup="{'publisherId':?#{#self._id} }")
List<OneToManyStyleBook> books;

public OneToManyStylePublisherWithRequiredArgsCtor(String id, List<OneToManyStyleBook> books) {
this.id = id;
this.books = books;
}

public String getId() {
return this.id;
}

public List<OneToManyStyleBook> getBooks() {
return this.books;
}

public void setId(String id) {
this.id = id;
}

public void setBooks(List<OneToManyStyleBook> books) {
this.books = books;
}

public String toString() {
return "MongoTemplateDocumentReferenceTests.OneToManyStylePublisherWithRequiredArgsCtor(id=" + this.getId() + ", book="
+ this.getBooks() + ")";
}
}
}

0 comments on commit f0858fb

Please sign in to comment.