DATACOUCH-616 - Fix parsing of String Query containing conditionals in quotes

For a query as below that has conditional portions, the parsing for
parameters was being done before the conditional portions were being
resolved, which left the parameters between quotes where they wre
not being recognized as query parameters.

@query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} " +
	" #{#projectIds != null ? 'AND iata IN $1' : ''} ")
Long count(@param("projectIds") List<String> projectIds)

Author: mikereiche

src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.couchbase.core;
 
-import com.couchbase.client.java.kv.UpsertOptions;
 import org.springframework.data.couchbase.core.mapping.Document;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -98,7 +97,7 @@ private InsertOptions buildInsertOptions() {
 			} else if (durabilityLevel != DurabilityLevel.NONE) {
 				options.durability(durabilityLevel);
 			}
-			if (expiry != null) {
+			if (expiry != null && !expiry.equals(Duration.ofSeconds(0))) {
 				options.expiry(expiry);
 			} else if (domainType.isAnnotationPresent(Document.class)) {
 				Document documentAnn = domainType.getAnnotation(Document.class);

src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java

@@ -98,7 +98,7 @@ private UpsertOptions buildUpsertOptions() {
 			} else if (durabilityLevel != DurabilityLevel.NONE) {
 				options.durability(durabilityLevel);
 			}
-			if (expiry != null) {
+			if (expiry != null && ! expiry.equals( Duration.ofSeconds(0))) {
 				options.expiry(expiry);
 			} else if (domainType.isAnnotationPresent(Document.class)) {
 				Document documentAnn = domainType.getAnnotation(Document.class);

src/main/java/org/springframework/data/couchbase/repository/Query.java

@@ -23,7 +23,6 @@
 
 import org.springframework.data.annotation.QueryAnnotation;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
-import org.springframework.data.couchbase.repository.query.StringN1qlBasedQuery;
 
 /**
  * Annotation to support the use of N1QL queries with Couchbase.

src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringN1qlBasedQuery.java

@@ -32,16 +32,21 @@
 import org.springframework.data.couchbase.core.query.N1QLExpression;
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.couchbase.repository.query.support.N1qlUtils;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ReturnedType;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.common.TemplateParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
 import com.couchbase.client.java.json.JsonArray;
 import com.couchbase.client.java.json.JsonObject;
 import com.couchbase.client.java.json.JsonValue;
+import org.springframework.util.Assert;
 
 /**
  * @author Subhashni Balakrishnan
@@ -103,20 +108,23 @@ public class StringBasedN1qlQueryParser {
 	private static final Logger LOGGER = LoggerFactory.getLogger(StringBasedN1qlQueryParser.class);
 	private final String statement;
 	private final QueryMethod queryMethod;
-	private final PlaceholderType placeHolderType;
+	private  PlaceholderType placeHolderType;
 	private final N1qlSpelValues statementContext;
 	private final N1qlSpelValues countContext;
 	private final CouchbaseConverter couchbaseConverter;
 	private final Collection<String> parameterNames = new HashSet<String>();
+	public final N1QLExpression parsedExpression;
 
 	public StringBasedN1qlQueryParser(String statement, QueryMethod queryMethod, String bucketName,
-			CouchbaseConverter couchbaseConverter, String typeField, String typeValue) {
+			CouchbaseConverter couchbaseConverter, String typeField, String typeValue, ParameterAccessor accessor,
+			SpelExpressionParser parser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
 		this.statement = statement;
 		this.queryMethod = queryMethod;
-		this.placeHolderType = checkPlaceholders(statement);
 		this.statementContext = createN1qlSpelValues(bucketName, typeField, typeValue, false);
 		this.countContext = createN1qlSpelValues(bucketName, typeField, typeValue, true);
 		this.couchbaseConverter = couchbaseConverter;
+		this.parsedExpression = getExpression(accessor, getParameters(accessor), null, parser, evaluationContextProvider);
+		checkPlaceholders( this.parsedExpression.toString() );
 	}
 
 	public static N1qlSpelValues createN1qlSpelValues(String bucketName, String typeField, String typeValue,
@@ -151,7 +159,7 @@ public String doParse(SpelExpressionParser parser, EvaluationContext evaluationC
 		return parsedExpression.getValue(evaluationContext, String.class);
 	}
 
-	private PlaceholderType checkPlaceholders(String statement) {
+	private void checkPlaceholders(String statement) {
 
 		Matcher quoteMatcher = QUOTE_DETECTION_PATTERN.matcher(statement);
 		Matcher positionMatcher = POSITIONAL_PLACEHOLDER_PATTERN.matcher(statement);
@@ -192,11 +200,11 @@ private PlaceholderType checkPlaceholders(String statement) {
 		}
 
 		if (posCount > 0) {
-			return PlaceholderType.POSITIONAL;
+			placeHolderType = PlaceholderType.POSITIONAL;
 		} else if (namedCount > 0) {
-			return PlaceholderType.NAMED;
+			placeHolderType = PlaceholderType.NAMED;
 		} else {
-			return PlaceholderType.NONE;
+			placeHolderType = PlaceholderType.NONE;
 		}
 	}
 
@@ -402,5 +410,39 @@ public N1qlSpelValues(String selectClause, String entityFields, String bucket, S
 			this.returning = returning;
 		}
 	}
+	// copied from StringN1qlBasedQuery
+	private N1QLExpression getExpression(ParameterAccessor accessor, Object[] runtimeParameters,
+																			 ReturnedType returnedType, SpelExpressionParser parser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+		boolean isCountQuery = queryMethod.getName().toLowerCase().startsWith("count"); // should be queryMethod.isCountQuery()
+		EvaluationContext evaluationContext = evaluationContextProvider
+				.getEvaluationContext(queryMethod.getParameters(), runtimeParameters);
+		N1QLExpression parsedStatement = x(this.doParse(parser, evaluationContext, isCountQuery));
+
+		Sort sort = accessor.getSort();
+		if (sort.isSorted()) {
+			N1QLExpression[] cbSorts = N1qlUtils.createSort(sort);
+			parsedStatement = parsedStatement.orderBy(cbSorts);
+		}
+		if (queryMethod.isPageQuery()) {
+			Pageable pageable = accessor.getPageable();
+			Assert.notNull(pageable, "Pageable must not be null!");
+			parsedStatement = parsedStatement.limit(pageable.getPageSize()).offset(
+					Math.toIntExact(pageable.getOffset()));
+		} else if (queryMethod.isSliceQuery()) {
+			Pageable pageable = accessor.getPageable();
+			Assert.notNull(pageable, "Pageable must not be null!");
+			parsedStatement = parsedStatement.limit(pageable.getPageSize() + 1).offset(
+					Math.toIntExact(pageable.getOffset()));
+		}
+		return parsedStatement;
+	}
 
+	// getExpression() could do this itself, but pass as an arg to be consistent with StringN1qlBasedQuery
+	private static Object[] getParameters(ParameterAccessor accessor) {
+		ArrayList<Object> params = new ArrayList<>();
+		for (Object o : accessor) {
+			params.add(o);
+		}
+		return params.toArray();
+	}
 }