HSEARCH-3319 Remove now unnecessary withRoot(Reference)

Author: marko-bekhta

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactory.java

@@ -7,7 +7,6 @@
 import java.util.function.Function;
 
 import org.hibernate.search.engine.search.common.NamedValues;
-import org.hibernate.search.engine.search.reference.object.ObjectFieldReference;
 import org.hibernate.search.util.common.SearchException;
 import org.hibernate.search.util.common.annotation.Incubating;
 
@@ -147,20 +146,6 @@ <T> AggregationFinalStep<T> withParameters(
 	@Incubating
 	SearchAggregationFactory<SR> withRoot(String objectFieldPath);
 
-	/**
-	 * Create a new aggregation factory whose root for all paths passed to the DSL
-	 * will be the given object field.
-	 * <p>
-	 * See <a href="#field-paths">here</a> for more information.
-	 *
-	 * @param objectFieldReference The reference representing the path from the current root to an object field that will become the new root.
-	 * @return A new aggregation factory using the given object field as root.
-	 */
-	@Incubating
-	default SearchAggregationFactory<SR> withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
-
 	/**
 	 * @param relativeFieldPath The path to a field, relative to the {@link #withRoot(String) root} of this factory.
 	 * @return The absolute path of the field, for use in native aggregations for example.

engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/SearchPredicateFactory.java

@@ -11,7 +11,6 @@
 import org.hibernate.search.engine.search.common.BooleanOperator;
 import org.hibernate.search.engine.search.common.NamedValues;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
-import org.hibernate.search.engine.search.reference.object.ObjectFieldReference;
 import org.hibernate.search.engine.search.reference.predicate.NestedPredicateFieldReference;
 import org.hibernate.search.util.common.SearchException;
 import org.hibernate.search.util.common.annotation.Incubating;
@@ -376,21 +375,6 @@ PredicateFinalStep withParameters(
 	@Incubating
 	SearchPredicateFactory<SR> withRoot(String objectFieldPath);
 
-	/**
-	 * Create a new predicate factory whose root for all paths passed to the DSL
-	 * will be the given object field.
-	 * <p>
-	 * This is used to call reusable methods that apply the same predicate
-	 * on different object fields that have same structure (same sub-fields).
-	 *
-	 * @param objectFieldReference The reference representing the path from the current root to an object field that will become the new root.
-	 * @return A new predicate factory using the given object field as root.
-	 */
-	@Incubating
-	default SearchPredicateFactory<SR> withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
-
 	/**
 	 * @param relativeFieldPath The path to a field, relative to the {@link #withRoot(String) root} of this factory.
 	 * @return The absolute path of the field, for use in native predicates for example.

engine/src/main/java/org/hibernate/search/engine/search/projection/dsl/ExtendedSearchProjectionFactory.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.search.engine.search.projection.dsl;
 
-import org.hibernate.search.engine.search.reference.object.ObjectFieldReference;
-
 /**
  * A base interface for subtypes of {@link SearchProjectionFactory} allowing to
  * easily override the self type for all relevant methods.
@@ -22,9 +20,4 @@ public interface ExtendedSearchProjectionFactory<SR, S extends ExtendedSearchPro
 	@Override
 	S withRoot(String objectFieldPath);
 
-
-	@Override
-	default S withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
 }

engine/src/main/java/org/hibernate/search/engine/search/projection/dsl/SearchProjectionFactory.java

@@ -522,21 +522,6 @@ <T> ProjectionFinalStep<T> withParameters(
 	@Incubating
 	SearchProjectionFactory<SR, R, E> withRoot(String objectFieldPath);
 
-	/**
-	 * Create a new projection factory whose root for all paths passed to the DSL
-	 * will be the given object field.
-	 * <p>
-	 * This is used to call reusable methods that can apply the same projection
-	 * on different object fields that have same structure (same sub-fields).
-	 *
-	 * @param objectFieldReference The reference representing the path from the current root to an object field that will become the new root.
-	 * @return A new projection factory using the given object field as root.
-	 */
-	@Incubating
-	default SearchProjectionFactory<SR, R, E> withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
-
 	/**
 	 * @param relativeFieldPath The path to a field, relative to the {@link #withRoot(String) root} of this factory.
 	 * @return The absolute path of the field, for use in native projections for example.

engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/ExtendedSearchSortFactory.java

@@ -7,7 +7,6 @@
 import java.util.function.Function;
 
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
-import org.hibernate.search.engine.search.reference.object.ObjectFieldReference;
 import org.hibernate.search.engine.search.reference.sort.FieldSortFieldReference;
 import org.hibernate.search.engine.spatial.GeoPoint;
 
@@ -31,11 +30,6 @@ public interface ExtendedSearchSortFactory<
 	@Override
 	S withRoot(String objectFieldPath);
 
-	@Override
-	default S withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
-
 	@Override
 	FieldSortOptionsStep<SR, ?, PDF> field(String fieldPath);
 

engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/SearchSortFactory.java

@@ -9,7 +9,6 @@
 
 import org.hibernate.search.engine.search.common.NamedValues;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
-import org.hibernate.search.engine.search.reference.object.ObjectFieldReference;
 import org.hibernate.search.engine.search.reference.sort.FieldSortFieldReference;
 import org.hibernate.search.engine.spatial.GeoPoint;
 import org.hibernate.search.util.common.SearchException;
@@ -224,21 +223,6 @@ public interface SearchSortFactory<SR> {
 	@Incubating
 	SearchSortFactory<SR> withRoot(String objectFieldPath);
 
-	/**
-	 * Create a new sort factory whose root for all paths passed to the DSL
-	 * will be the given object field.
-	 * <p>
-	 * This is used to call reusable methods that can apply the same sort
-	 * on different object fields that have same structure (same sub-fields).
-	 *
-	 * @param objectFieldReference The reference representing the path from the current root to an object field that will become the new root.
-	 * @return A new sort factory using the given object field as root.
-	 */
-	@Incubating
-	default SearchSortFactory<SR> withRoot(ObjectFieldReference<? super SR> objectFieldReference) {
-		return withRoot( objectFieldReference.absolutePath() );
-	}
-
 	/**
 	 * @param relativeFieldPath The path to a field, relative to the {@link #withRoot(String) root} of this factory.
 	 * @return The absolute path of the field, for use in native sorts for example.