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

DATACOUCH-155 - Correctly escape property path.

Browse Source 
Additionally to resolving a POJO attribute to JSON field name, the path conversion step will also escape each part of the doted path, in order to avoid problems with N1QL keywords.
This commit is contained in:
Simon Baslé
2015-07-31 17:47:39 +02:00
parent 2035a88dba
commit 60196095a6
4 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
View File

@@ -16,9 +16,7 @@
package org.springframework.data.couchbase.core.mapping;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.context.PersistentPropertyPath;
/**
* Represents a property part of an entity that needs to be persisted.
@@ -33,17 +31,4 @@ public interface CouchbasePersistentProperty extends PersistentProperty<Couchbas
* The field name can be different from the actual property name by using a custom annotation.
*/
String getFieldName();
/**
* A converter that can be used to extract the {@link #getFieldName() fieldName}, eg. when one wants
* a path from {@link PersistentPropertyPath#toDotPath(Converter)} made of field names.
*/
Converter<? super CouchbasePersistentProperty,String> FIELD_NAME = new Converter<CouchbasePersistentProperty, String>() {
@Override
public String convert(CouchbasePersistentProperty source) {
return source.getFieldName();
}
};
}

14
src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
View File

@@ -32,6 +32,7 @@ import com.couchbase.client.java.query.dsl.path.LimitPath;
import com.couchbase.client.java.query.dsl.path.OrderByPath;
import com.couchbase.client.java.query.dsl.path.WherePath;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.domain.Sort;
@@ -146,7 +147,7 @@ public class N1qlQueryCreator extends AbstractQueryCreator<LimitPath, Expression
ConvertingIterator parameterValues = new ConvertingIterator(iterator, converter);
//get the whole doted path with fieldNames instead of potentially wrong propNames
String fieldNamePath = path.toDotPath(CouchbasePersistentProperty.FIELD_NAME);
String fieldNamePath = path.toDotPath(FIELD_NAME_ESCAPED);
//deal with ignore case
boolean ignoreCase = false;
@@ -297,4 +298,15 @@ public class N1qlQueryCreator extends AbstractQueryCreator<LimitPath, Expression
return JsonArray.from(values);
}
/**
* A converter that can be used to extract the {@link CouchbasePersistentProperty#getFieldName() fieldName},
* eg. when one wants a path from {@link PersistentPropertyPath#toDotPath(Converter)} made of escaped field names.
*/
Converter<? super CouchbasePersistentProperty,String> FIELD_NAME_ESCAPED = new Converter<CouchbasePersistentProperty, String>() {
@Override
public String convert(CouchbasePersistentProperty source) {
return "`" + source.getFieldName() + "`";
}
};
}