mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1988 - Polishing.

Browse Source 
Match exactly for either top-level properties of leaf-properties instead of accepting the property/field name suffix.

Original pull request: #565.
This commit is contained in:
Mark Paluch
2018-06-05 11:09:35 +02:00
parent 22c0e5029c
commit 28b18d25cb
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -833,7 +833,7 @@ public class QueryMapper {
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdKey() * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdField()
*/ */
@Override @Override
public boolean isIdField() { public boolean isIdField() {
@@ -842,7 +842,9 @@ public class QueryMapper {
: entity.getIdProperty(); : entity.getIdProperty();
if (idProperty != null) { if (idProperty != null) {
return name.endsWith(idProperty.getName()) || name.endsWith(idProperty.getFieldName());
return name.equals(idProperty.getName()) || name.equals(idProperty.getFieldName())
|| name.endsWith("." + idProperty.getName()) || name.endsWith("." + idProperty.getFieldName());
} }
return DEFAULT_ID_NAMES.contains(name); return DEFAULT_ID_NAMES.contains(name);

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

@@ -783,6 +783,16 @@ public class QueryMapperUnitTests {
assertThat(document.get("sample._id"), instanceOf(ObjectId.class)); assertThat(document.get("sample._id"), instanceOf(ObjectId.class));
} }
@Test // DATAMONGO-1988
public void matchesExactFieldNameToIdProperty() {
Query query = query(where("sample.iid").is(new ObjectId().toHexString()));
org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
context.getPersistentEntity(ClassWithEmbedded.class));
assertThat(document.get("sample.iid"), instanceOf(String.class));
}
@Test // DATAMONGO-1988 @Test // DATAMONGO-1988
public void leavesNonObjectIdStringIdRepresentationUntouchedWhenReferencingIdProperty() { public void leavesNonObjectIdStringIdRepresentationUntouchedWhenReferencingIdProperty() {