HSEARCH-3661 Fix the interface names

Author: marko-bekhta

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

@@ -31,5 +31,5 @@ public interface RangeAggregationRangeMoreStep<
 		A>
 		extends RangeAggregationOptionsStep<SR, N, PDF, F, Map<Range<F>, A>>,
 		RangeAggregationRangeStep<SR, S, PDF, F, A>,
-		RangeAggregationRangeValueStep<SR, PDF, F> {
+		RangeAggregationValueStep<SR, PDF, F> {
 }

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeValueStep.java renamed to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationValueStep.java

@@ -20,7 +20,7 @@
  * @param <F> The type of the targeted field.
  */
 @Incubating
-public interface RangeAggregationRangeValueStep<
+public interface RangeAggregationValueStep<
 		SR,
 		PDF extends TypedSearchPredicateFactory<SR>,
 		F> {

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

@@ -27,7 +27,7 @@ public interface TermsAggregationFieldStep<SR, PDF extends TypedSearchPredicateF
 	 * @param <F> The type of field values.
 	 * @return The next step.
 	 */
-	default <F> TermsAggregationRangeValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type) {
+	default <F> TermsAggregationValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type) {
 		return field( fieldPath, type, ValueModel.MAPPING );
 	}
 
@@ -43,7 +43,7 @@ public interface TermsAggregationFieldStep<SR, PDF extends TypedSearchPredicateF
 	 * @deprecated Use {@link #field(String, Class, ValueModel)} instead.
 	 */
 	@Deprecated(since = "7.2")
-	default <F> TermsAggregationRangeValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
+	default <F> TermsAggregationValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
 			org.hibernate.search.engine.search.common.ValueConvert convert) {
 		return field( fieldPath, type,
 				org.hibernate.search.engine.search.common.ValueConvert.toValueModel( convert ) );
@@ -59,7 +59,7 @@ public interface TermsAggregationFieldStep<SR, PDF extends TypedSearchPredicateF
 	 * See {@link ValueModel}.
 	 * @return The next step.
 	 */
-	<F> TermsAggregationRangeValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
+	<F> TermsAggregationValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
 			ValueModel valueModel);
 
 	/**
@@ -69,7 +69,7 @@ public interface TermsAggregationFieldStep<SR, PDF extends TypedSearchPredicateF
 	 * @param <F> The type of field values.
 	 * @return The next step.
 	 */
-	default <F> TermsAggregationRangeValueStep<SR, ?, PDF, F, Map<F, Long>> field(
+	default <F> TermsAggregationValueStep<SR, ?, PDF, F, Map<F, Long>> field(
 			TermsAggregationFieldReference<? super SR, F> fieldReference) {
 		return field( fieldReference.absolutePath(), fieldReference.aggregationType(), fieldReference.valueModel() );
 	}

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationRangeValueStep.java renamed to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationValueStep.java

@@ -19,7 +19,7 @@
  * @param <F> The type of the targeted field.
  */
 @Incubating
-public interface TermsAggregationRangeValueStep<
+public interface TermsAggregationValueStep<
 		SR,
 		S extends TermsAggregationOptionsStep<SR, ?, PDF, F, A>,
 		PDF extends TypedSearchPredicateFactory<SR>,

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationFieldStepImpl.java

@@ -7,7 +7,7 @@
 import java.util.Map;
 
 import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationFieldStep;
-import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationRangeValueStep;
+import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationValueStep;
 import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext;
 import org.hibernate.search.engine.search.aggregation.spi.AggregationTypeKeys;
 import org.hibernate.search.engine.search.aggregation.spi.TermsAggregationBuilder;
@@ -24,7 +24,7 @@ public TermsAggregationFieldStepImpl(SearchAggregationDslContext<SR, ?, ? extend
 	}
 
 	@Override
-	public <F> TermsAggregationRangeValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
+	public <F> TermsAggregationValueStep<SR, ?, PDF, F, Map<F, Long>> field(String fieldPath, Class<F> type,
 			ValueModel valueModel) {
 		Contracts.assertNotNull( fieldPath, "fieldPath" );
 		Contracts.assertNotNull( type, "type" );

engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationOptionsStepImpl.java

@@ -9,7 +9,7 @@
 
 import org.hibernate.search.engine.search.aggregation.SearchAggregation;
 import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationOptionsStep;
-import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationRangeValueStep;
+import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationValueStep;
 import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext;
 import org.hibernate.search.engine.search.aggregation.spi.TermsAggregationBuilder;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
@@ -18,7 +18,7 @@
 import org.hibernate.search.util.common.impl.Contracts;
 
 class TermsAggregationOptionsStepImpl<SR, PDF extends TypedSearchPredicateFactory<SR>, F, V>
-		implements TermsAggregationRangeValueStep<SR, TermsAggregationOptionsStepImpl<SR, PDF, F, V>, PDF, F, Map<F, V>> {
+		implements TermsAggregationValueStep<SR, TermsAggregationOptionsStepImpl<SR, PDF, F, V>, PDF, F, Map<F, V>> {
 	private final TermsAggregationBuilder<F, V> builder;
 	private final SearchAggregationDslContext<SR, ?, ? extends PDF> dslContext;