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

DATAMONGO-1269 - Polishing.

Browse Source 
Original pull request: #314.
This commit is contained in:
Oliver Gierke
2015-08-06 10:53:12 +02:00
parent b103e4eaf6
commit 335c78f908
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -889,10 +889,14 @@ public class QueryMapper {
private final KeyMapper keyMapper;
PositionParameterRetainingPropertyKeyConverter(String rawKey) {
public PositionParameterRetainingPropertyKeyConverter(String rawKey) {
this.keyMapper = new KeyMapper(rawKey);
}
/*
* (non-Javadoc)
* @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
*/
@Override
public String convert(MongoPersistentProperty source) {
return keyMapper.mapPropertyName(source);
@@ -926,7 +930,7 @@ public class QueryMapper {
*/
static class KeyMapper {
Iterator<String> iterator;
private final Iterator<String> iterator;
public KeyMapper(String key) {
@@ -943,14 +947,13 @@ public class QueryMapper {
protected String mapPropertyName(MongoPersistentProperty property) {
String mappedName = PropertyToFieldNameConverter.INSTANCE.convert(property);
boolean inspect = iterator.hasNext();
while (inspect) {
String partial = iterator.next();
boolean isPositional = (isPositionalParameter(partial) && (property.isMap() || property.isCollectionLike()));
boolean isPositional = (isPositionalParameter(partial) && (property.isMap() || property.isCollectionLike() || property
.isArray()));
if (isPositional) {
mappedName += "." + partial;
}
@@ -961,7 +964,7 @@ public class QueryMapper {
return mappedName;
}
boolean isPositionalParameter(String partial) {
private static boolean isPositionalParameter(String partial) {
if (partial.equals("$")) {
return true;
@@ -975,7 +978,6 @@ public class QueryMapper {
}
}
}
}
/**