Support has_child and has_parent queries.

Signed-off-by: Youssef Aouichaoui <youssef3wi@icloud.com>

Author: youssef3wi

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryProcessor.java

@@ -16,12 +16,14 @@
 package org.springframework.data.elasticsearch.client.elc;
 
 import static org.springframework.data.elasticsearch.client.elc.Queries.*;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.scoreMode;
 import static org.springframework.util.StringUtils.*;
 
 import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.query_dsl.ChildScoreMode;
 import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch.core.search.InnerHits;
 import co.elastic.clients.json.JsonData;
 
 import java.util.ArrayList;
@@ -30,7 +32,12 @@
 
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.core.query.Field;
+import org.springframework.data.elasticsearch.core.query.HasChildQuery;
+import org.springframework.data.elasticsearch.core.query.HasParentQuery;
+import org.springframework.data.elasticsearch.core.query.InnerHitsQuery;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -343,6 +350,34 @@ private static Query.Builder queryFor(Criteria.CriteriaEntry entry, Field field,
 								.value(value.toString()) //
 								.boost(boost)); //
 				break;
+			case HAS_CHILD:
+				if (value instanceof HasChildQuery query) {
+					queryBuilder.hasChild(hcb -> hcb
+							.type(query.getType())
+							.query(getQuery(query.getQuery()))
+							.innerHits(getInnerHits(query.getInnerHitsQuery()))
+							.ignoreUnmapped(query.getIgnoreUnmapped())
+                            .minChildren(query.getMinChildren())
+                            .maxChildren(query.getMaxChildren())
+                            .scoreMode(scoreMode(query.getScoreMode()))
+					);
+				} else {
+					throw new CriteriaQueryException("value for " + fieldName + " is not a has_child query");
+				}
+                break;
+            case HAS_PARENT:
+                if (value instanceof HasParentQuery query) {
+					queryBuilder.hasParent(hpb -> hpb
+							.parentType(query.getParentType())
+							.query(getQuery(query.getQuery()))
+							.innerHits(getInnerHits(query.getInnerHitsQuery()))
+							.ignoreUnmapped(query.getIgnoreUnmapped())
+							.score(query.getScore())
+					);
+                } else {
+                    throw new CriteriaQueryException("value for " + fieldName + " is not a has_parent query");
+                }
+                break;
 			default:
 				throw new CriteriaQueryException("Could not build query for " + entry);
 		}
@@ -397,4 +432,48 @@ public static String escape(String s) {
 		return sb.toString();
 	}
 
+    /**
+     * Convert a spring-data-elasticsearch {@literal query} to an Elasticsearch {@literal query}.
+     * <p>
+     * The reason it was copied from {@link RequestConverter#getQuery(org.springframework.data.elasticsearch.core.query.Query, Class)} is because of a circular dependency.
+     *
+     * @param query spring-data-elasticsearch {@literal query}.
+     * @return an Elasticsearch {@literal query}.
+     */
+    private static Query getQuery(org.springframework.data.elasticsearch.core.query.Query query) {
+        Query esQuery = null;
+
+        if (query instanceof CriteriaQuery) {
+            esQuery = createQuery(((CriteriaQuery) query).getCriteria());
+        } else if (query instanceof StringQuery) {
+            esQuery = Queries.wrapperQueryAsQuery(((StringQuery) query).getSource());
+        } else if (query instanceof NativeQuery nativeQuery) {
+            if (nativeQuery.getQuery() != null) {
+                esQuery = nativeQuery.getQuery();
+            } else if (nativeQuery.getSpringDataQuery() != null) {
+                esQuery = getQuery(nativeQuery.getSpringDataQuery());
+            }
+        } else {
+            throw new IllegalArgumentException("unhandled Query implementation " + query.getClass().getName());
+        }
+
+        Assert.notNull(query, "query must not be null.");
+        return esQuery;
+    }
+
+    /**
+     * Convert a spring-data-elasticsearch {@literal inner_hits} to an Elasticsearch {@literal inner_hits} query.
+     *
+     * @param query spring-data-elasticsearch {@literal inner_hits}.
+     * @return an Elasticsearch {@literal inner_hits} query.
+     */
+    @Nullable
+    private static InnerHits getInnerHits(@Nullable InnerHitsQuery query) {
+        if (query == null) {
+            return null;
+        }
+
+        return InnerHits.of(iqb -> iqb.from(query.getFrom()).size(query.getSize()).name(query.getName()));
+    }
+
 }

src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java

@@ -18,6 +18,7 @@
 import co.elastic.clients.elasticsearch._types.*;
 import co.elastic.clients.elasticsearch._types.mapping.FieldType;
 import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
+import co.elastic.clients.elasticsearch._types.query_dsl.ChildScoreMode;
 import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
 import co.elastic.clients.elasticsearch.core.search.BoundaryScanner;
 import co.elastic.clients.elasticsearch.core.search.HighlighterEncoder;
@@ -41,6 +42,7 @@
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
+import org.springframework.data.elasticsearch.core.query.HasChildQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.IndicesOptions;
 import org.springframework.data.elasticsearch.core.query.Order;
@@ -527,4 +529,24 @@ static Operator operator(@Nullable OperatorType operator) {
 	static Conflicts conflicts(@Nullable ConflictsType conflicts) {
 		return conflicts != null ? Conflicts.valueOf(conflicts.name()) : null;
 	}
+
+	/**
+	 * Convert a spring-data-elasticsearch {@literal scoreMode} to an Elasticsearch {@literal scoreMode}.
+	 *
+	 * @param scoreMode spring-data-elasticsearch {@literal scoreMode}.
+	 * @return an Elasticsearch {@literal scoreMode}.
+	 */
+	static ChildScoreMode scoreMode(@Nullable HasChildQuery.ScoreMode scoreMode) {
+		if (scoreMode == null) {
+			return ChildScoreMode.None;
+		}
+
+		return switch (scoreMode) {
+			case Avg -> ChildScoreMode.Avg;
+			case Max -> ChildScoreMode.Max;
+			case Min -> ChildScoreMode.Min;
+			case Sum -> ChildScoreMode.Sum;
+			default -> ChildScoreMode.None;
+		};
+	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java

@@ -816,6 +816,32 @@ public Criteria contains(GeoJson<?> geoShape) {
 		filterCriteriaEntries.add(new CriteriaEntry(OperationKey.GEO_CONTAINS, geoShape));
 		return this;
 	}
+
+	/**
+	 * Adds a new filter CriteriaEntry for HAS_CHILD.
+	 *
+	 * @param query the has_child query.
+	 * @return the current Criteria.
+	 */
+	public Criteria hasChild(HasChildQuery query) {
+		Assert.notNull(query, "has_child query must not be null.");
+
+		queryCriteriaEntries.add(new CriteriaEntry(OperationKey.HAS_CHILD, query));
+		return this;
+	}
+
+	/**
+	 * Adds a new filter CriteriaEntry for HAS_PARENT.
+	 *
+	 * @param query the has_parent query.
+	 * @return the current Criteria.
+	 */
+	public Criteria hasParent(HasParentQuery query) {
+		Assert.notNull(query, "has_parent query must not be null.");
+
+		queryCriteriaEntries.add(new CriteriaEntry(OperationKey.HAS_PARENT, query));
+		return this;
+	}
 	// endregion
 
 	// region helper functions
@@ -977,7 +1003,12 @@ public enum OperationKey { //
 		/**
 		 * @since 5.1
 		 */
-		REGEXP;
+		REGEXP,
+		/**
+		 * @since 5.3
+		 */
+		HAS_CHILD,
+		HAS_PARENT;
 
 		/**
 		 * @return true if this key does not have an associated value