Skip to content

Commit a415cb9

Browse files
Fixed the non working stuff - next repositories
1 parent e6c9fce commit a415cb9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,11 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
511511
*/
512512
@Nullable
513513
protected Object delegateConvertToMongoType(Object source, @Nullable MongoPersistentEntity<?> entity) {
514+
515+
if (entity != null && entity.isEmbedded()) {
516+
return converter.convertToMongoType(source, entity);
517+
}
518+
514519
return converter.convertToMongoType(source, entity == null ? null : entity.getTypeInformation());
515520
}
516521

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.bson.types.Code;
3333
import org.bson.types.ObjectId;
3434
import org.junit.jupiter.api.BeforeEach;
35-
import org.junit.jupiter.api.Disabled;
3635
import org.junit.jupiter.api.Test;
3736
import org.junit.jupiter.api.extension.ExtendWith;
3837
import org.mockito.Mock;
@@ -1063,7 +1062,6 @@ void rendersQueryOnNestedEmbeddedObjectCorrectly() {
10631062
}
10641063

10651064
@Test // DATAMONGO-1902
1066-
@Disabled
10671065
void rendersQueryOnNestedPrefixedEmbeddedObjectCorrectly() {
10681066

10691067
EmbeddableType embeddableType = new EmbeddableType();
@@ -1073,7 +1071,8 @@ void rendersQueryOnNestedPrefixedEmbeddedObjectCorrectly() {
10731071
org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
10741072
context.getPersistentEntity(WrapperAroundWithEmbedded.class));
10751073

1076-
assertThat(target).isEqualTo(new org.bson.Document("withPrefixedEmbedded", new org.bson.Document("prefix-stringValue", "test")));
1074+
assertThat(target)
1075+
.isEqualTo(new org.bson.Document("withPrefixedEmbedded", new org.bson.Document("prefix-stringValue", "test")));
10771076
}
10781077

10791078
@Test // DATAMONGO-1902

0 commit comments

Comments
 (0)