HSEARCH-3661 Make eclipse compiler happier with generics in more complex aggregations

Author: marko-bekhta

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/RangeAggregationSpecificsIT.java

@@ -26,6 +26,7 @@
 import org.hibernate.search.engine.backend.types.Aggregable;
 import org.hibernate.search.engine.backend.types.Searchable;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
+import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep;
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.AggregationDescriptor;
@@ -605,7 +606,8 @@ void rangesBucket_min(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
 												Range.canonical( dataSet.ascendingValues.get( 3 ),
 														dataSet.ascendingValues.get( 5 ) ),
 												Range.canonical( dataSet.ascendingValues.get( 5 ), null )
-										) ).value( f.min().field( fieldPath, fieldType.getJavaType() ) )
+										) )
+										.value( (AggregationFinalStep<F>) f.min().field( fieldPath, fieldType.getJavaType() ) )
 						)
 						.routing( dataSet.name )
 						.toQuery()
@@ -644,7 +646,8 @@ void rangesBucket_max(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
 												Range.canonical( dataSet.ascendingValues.get( 3 ),
 														dataSet.ascendingValues.get( 5 ) ),
 												Range.canonical( dataSet.ascendingValues.get( 5 ), null )
-										) ).value( f.max().field( fieldPath, fieldType.getJavaType() ) )
+										) )
+										.value( (AggregationFinalStep<F>) f.max().field( fieldPath, fieldType.getJavaType() ) )
 						)
 						.routing( dataSet.name )
 						.toQuery()
@@ -764,8 +767,8 @@ void rangesBucket_terms_countImplicit(FieldTypeDescriptor<F, ?> fieldType, DataS
 														dataSet.ascendingValues.get( 5 ) ),
 												Range.canonical( dataSet.ascendingValues.get( 5 ), null )
 										) )
-										.value( f.terms().field( index.binding().bucketMultiValue.relativeFieldName,
-												Integer.class ) )
+										.value( (AggregationFinalStep<Map<Integer, Long>>) f.terms()
+												.field( index.binding().bucketMultiValue.relativeFieldName, Integer.class ) )
 						)
 						.routing( dataSet.name )
 						.toQuery()
@@ -805,10 +808,10 @@ void rangesBucket_terms_sum(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> data
 														dataSet.ascendingValues.get( 5 ) ),
 												Range.canonical( dataSet.ascendingValues.get( 5 ), null )
 										) )
-										.value( f.terms()
+										.value( (AggregationFinalStep<Map<Integer, Integer>>) f.terms()
 												.field( index.binding().bucketMultiValue.relativeFieldName, Integer.class )
-												.value( f.sum().field( index.binding().bucketMultiValue.relativeFieldName,
-														Integer.class ) ) )
+												.value( (AggregationFinalStep<Integer>) f.sum().field(
+														index.binding().bucketMultiValue.relativeFieldName, Integer.class ) ) )
 						)
 						.routing( dataSet.name )
 						.toQuery()

integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/TermsAggregationSpecificsIT.java

@@ -27,6 +27,7 @@
 import org.hibernate.search.engine.backend.types.Aggregable;
 import org.hibernate.search.engine.backend.types.Searchable;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
+import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.AggregationDescriptor;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.TermsAggregationDescriptor;
@@ -648,7 +649,7 @@ void terms_min(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
 				.aggregation(
 						aggregationKey, f -> f.terms().field( fieldPath, fieldType.getJavaType() )
 								// while maybe silly as min/max == the same term as the key it is here just to test the nesting and aggregations:
-								.value( f.min().field( fieldPath, fieldType.getJavaType() ) )
+								.value( (AggregationFinalStep<F>) f.min().field( fieldPath, fieldType.getJavaType() ) )
 				)
 				.routing( dataSet.name ) )
 				.aggregation(
@@ -677,7 +678,7 @@ void terms_max(FieldTypeDescriptor<F, ?> fieldType, DataSet<F> dataSet) {
 				.aggregation(
 						aggregationKey, f -> f.terms().field( fieldPath, fieldType.getJavaType() )
 								// while maybe silly as min/max == the same term as the key it is here just to test the nesting and aggregations:
-								.value( f.max().field( fieldPath, fieldType.getJavaType() ) )
+								.value( (AggregationFinalStep<F>) f.max().field( fieldPath, fieldType.getJavaType() ) )
 				)
 				.routing( dataSet.name ) )
 				.aggregation(