FMWK-55 Supporting Map and List filtering (integer only), refactoring Qualifier, AerospikeCriteria, AerospikeQueryCreator

src/main/java/org/springframework/data/aerospike/query/ExpiryQualifier.java

@@ -28,7 +28,11 @@ public class ExpiryQualifier extends Qualifier {
 	private static final long serialVersionUID = 13172814137477042L;
 
 	public ExpiryQualifier(FilterOperation op, Value value) {
-		super(QueryEngine.Meta.EXPIRATION.toString(), op, value);
+		super(new QualifierBuilder()
+				.setField(QueryEngine.Meta.EXPIRATION.toString())
+				.setFilterOperation(op)
+				.setValue1(value)
+		);
 		if (value.getType() != ParticleType.INTEGER) {
 			throw new QualifierException("ExpiryQualifier value must be an integer or long");
 		}

src/main/java/org/springframework/data/aerospike/query/KeyQualifier.java

@@ -30,11 +30,19 @@ public class KeyQualifier extends Qualifier {
 	boolean hasDigest = false;
 
 	public KeyQualifier(Value value) {
-		super(QueryEngine.Meta.KEY.toString(), FilterOperation.EQ, value);
+		super(new QualifierBuilder()
+				.setField(QueryEngine.Meta.KEY.toString())
+				.setFilterOperation(FilterOperation.EQ)
+				.setValue1(value)
+		);
 	}
 
 	public KeyQualifier(byte[] digest) {
-		super(QueryEngine.Meta.KEY.toString(), FilterOperation.EQ, null);
+		super(new QualifierBuilder()
+				.setField(QueryEngine.Meta.KEY.toString())
+				.setFilterOperation(FilterOperation.EQ)
+				.setValue1(null)
+		);
 		this.internalMap.put("digest", digest);
 		this.hasDigest = true;
 	}

src/main/java/org/springframework/data/aerospike/query/LatestUpdateQualifier.java

@@ -28,7 +28,11 @@ public class LatestUpdateQualifier extends Qualifier {
 	private static final long serialVersionUID = -8767573059309320133L;
 
 	public LatestUpdateQualifier(FilterOperation op, Value value) {
-		super("latest_update_time", op, value); // the field should never be used as here we use a bit different logic
+		super(new QualifierBuilder()
+				.setField("latest_update_time")
+				.setFilterOperation(op)
+				.setValue1(value)
+		);
 		if (value.getType() != ParticleType.INTEGER) {
 			throw new QualifierException("LatestUpdateQualifer value must be an integer or long");
 		}