Merge pull request #12 from mzhangsfly/query_update

Added case insensitive support for query: startWith and contains.

Author: Jeff Boone

src/main/java/com/aerospike/helper/query/Qualifier.java

@@ -36,6 +36,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
+
 import com.aerospike.client.Value;
 import com.aerospike.client.command.ParticleType;
 import com.aerospike.client.query.Filter;
@@ -61,13 +63,14 @@
 public class Qualifier implements Map<String, Object>, Serializable {
 	private static final long serialVersionUID = -2689196529952712849L;
 	private static final String FIELD = "field";
+	private static final String IGNORE_CASE = "ignoreCase";
 	private static final String VALUE2 = "value2";
 	private static final String VALUE1 = "value1";
 	private static final String OPERATION = "operation";
 	protected Map<String, Object> internalMap;
 
 	public enum FilterOperation {
-		EQ, GT, GTEQ, LT, LTEQ, NOTEQ, BETWEEN, START_WITH, ENDS_WITH,CONTAINING,
+		EQ, GT, GTEQ, LT, LTEQ, NOTEQ, BETWEEN, START_WITH, ENDS_WITH, CONTAINING,
 		LIST_CONTAINS, MAP_KEYS_CONTAINS, MAP_VALUES_CONTAINS,
 		LIST_BETWEEN, MAP_KEYS_BETWEEN, MAP_VALUES_BETWEEN, GEO_WITHIN
 	}
@@ -78,14 +81,19 @@ public Qualifier() {
 	}
 
 	public Qualifier(String field, FilterOperation operation, Value value1) {
+		this(field, operation, IgnoreCaseType.NEVER, value1);
+	}
+	
+	public Qualifier(String field, FilterOperation operation, IgnoreCaseType ignoreCase, Value value1) {
 		this();
 		internalMap.put(FIELD, field);
 		internalMap.put(OPERATION, operation);
 		internalMap.put(VALUE1, value1);
+		internalMap.put(IGNORE_CASE, ignoreCase);
 	}
 
 	public Qualifier(String field, FilterOperation operation, Value value1, Value value2) {
-		this(field, operation, value1);
+		this(field, operation, IgnoreCaseType.NEVER, value1);
 		internalMap.put(VALUE2, value2);
 	}
 
@@ -194,15 +202,21 @@ public String luaFilterString() {
 				value2 = luaValueString(getValue2());
 				return String.format("rangeValue(%s, %s, %s)", luaFieldString(getField()), value1, value2);
 			case START_WITH:
-				return String.format("string.sub(%s,1,string.len(%s))==%s", luaFieldString(getField()), value1, value1);
+				if(IgnoreCaseType.ALWAYS == internalMap.get(IGNORE_CASE))
+					return String.format("string.upper(string.sub(%s,1,string.len(%s)))==%s", luaFieldString(getField()), value1, value1.toUpperCase());
+				else
+					return String.format("string.sub(%s,1,string.len(%s))==%s", luaFieldString(getField()), value1, value1);
 			case ENDS_WITH:
 				return String.format("%s=='' or string.sub(%s,-string.len(%s))==%s",
 						value1,
 						luaFieldString(getField()),
 						value1,
 						value1);
 			case CONTAINING:
-				return String.format("string.find(%s, %s)", luaFieldString(getField()), value1);
+				if(IgnoreCaseType.ALWAYS == internalMap.get(IGNORE_CASE))
+					return String.format("string.find(string.upper(%s), %s)", luaFieldString(getField()), value1.toUpperCase());
+				else
+					return String.format("string.find(%s, %s)", luaFieldString(getField()), value1);
 			case GEO_WITHIN:
 				return String.format("%s %d %s %s)", getField(), ParticleType.GEOJSON, value1, value1);
 		}

src/main/java/org/springframework/data/aerospike/repository/query/AerospikeQueryCreator.java

@@ -16,6 +16,7 @@
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
+import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
 import org.springframework.data.repository.query.parser.Part.Type;
 import org.springframework.data.repository.query.parser.PartTree;
 
@@ -73,7 +74,8 @@ protected Criteria create(Part part, Iterator<Object> iterator) {
 	private Criteria from(Part part, AerospikePersistentProperty property, Criteria criteria, Iterator<?> parameters) {
 		Type type = part.getType();
 		String fieldName = ((CachingAerospikePersistentProperty) property).getFieldName();
-
+		IgnoreCaseType ignoreCase = part.shouldIgnoreCase();
+		
 		switch (type) {
 			case AFTER:
 			case GREATER_THAN:
@@ -96,11 +98,11 @@ private Criteria from(Part part, AerospikePersistentProperty property, Criteria
 				return criteria.in(parameters.next());
 			case LIKE:
 			case STARTING_WITH:
-				return criteria.startingWith(parameters.next(), fieldName);
+				return criteria.startingWith(parameters.next(), fieldName, ignoreCase);
 			case ENDING_WITH:
 				return null;
 			case CONTAINING:
-				return criteria.containing(parameters.next(), fieldName);
+				return criteria.containing(parameters.next(), fieldName, ignoreCase);
 			case NOT_CONTAINING:
 				return null;
 			case REGEX:

src/main/java/org/springframework/data/aerospike/repository/query/Criteria.java

@@ -9,6 +9,7 @@
 
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.aerospike.InvalidAerospikeDataAccessApiUsageException;
+import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
 import org.springframework.util.CollectionUtils;
 
 import com.aerospike.client.Value;
@@ -293,9 +294,9 @@ public Criteria between(Object o1, Object o2,String propertyName) {
 	 * @param criteria2
 	 * @return
 	 */
-	public Criteria startingWith(Object o,String propertyName) {
+	public Criteria startingWith(Object o,String propertyName, IgnoreCaseType ignoreCase) {
 		Qualifier qualifier = new Qualifier(propertyName,
-				Qualifier.FilterOperation.START_WITH, Value.get(o));
+				Qualifier.FilterOperation.START_WITH, ignoreCase, Value.get(o));
 		this.criteria.put(Qualifier.FilterOperation.START_WITH.name(),
 				qualifier);
 		return this;
@@ -308,9 +309,9 @@ public Criteria startingWith(Object o,String propertyName) {
 	 * @param criteria2
 	 * @return
 	 */
-	public Criteria containing(Object o,String propertyName) {
+	public Criteria containing(Object o,String propertyName, IgnoreCaseType ignoreCase) {
 		Qualifier qualifier = new Qualifier(propertyName,
-				Qualifier.FilterOperation.CONTAINING, Value.get(o));
+				Qualifier.FilterOperation.CONTAINING, ignoreCase, Value.get(o));
 		this.criteria.put(Qualifier.FilterOperation.CONTAINING.name(),
 				qualifier);
 		return this;