fixed nested query using OR operators to using AND

Author: albogdano

pom.xml

@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>com.erudika</groupId>
 			<artifactId>para-core</artifactId>
-			<version>1.38.1</version>
+			<version>1.38.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

src/main/java/com/erudika/para/search/ElasticSearchUtils.java

@@ -86,6 +86,7 @@
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.NestedQueryBuilder;
+import org.elasticsearch.index.query.Operator;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
@@ -1314,8 +1315,8 @@ static QueryBuilder keyValueBoolQuery(String k, String v, QueryBuilder query) {
 		if (StringUtils.isBlank(k) || (query == null && StringUtils.isBlank(v))) {
 			return matchAllQuery();
 		}
-		QueryBuilder kQuery = matchQuery(PROPS_PREFIX + "k", getNestedKey(k));
-		QueryBuilder vQuery = (query == null) ? matchQuery(getValueFieldName(v), v) : query;
+		QueryBuilder kQuery = matchQuery(PROPS_PREFIX + "k", getNestedKey(k)).operator(Operator.AND);
+		QueryBuilder vQuery = (query == null) ? matchQuery(getValueFieldName(v), v).operator(Operator.AND) : query;
 		if ("*".equals(v) || matchAllQuery().equals(query)) {
 			return boolQuery().must(kQuery);
 		}