Fixing last compiling issues

Author: madduci

hapi-fhir-jpaserver-elastic-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/r4/HSearchSandboxTest.java

@@ -400,12 +400,12 @@ public PredicateFinalStep buildAndOrPredicates(
 			// we need to know if there is more than one "and" predicate (outer list) with more than one "or" predicate (inner list)
 			long maxOrPredicateSize = theAndOrTerms.stream().map(List::size).filter(s -> s > 1).count();
 
-			BooleanPredicateClausesStep<?> topBool = myPredicateFactory.bool();
+			BooleanPredicateClausesStep<?,?> topBool = myPredicateFactory.bool();
 			topBool.must(myPredicateFactory.match().field("myResourceType").matching("Observation"));
 
-			BooleanPredicateClausesStep<?> activeBool = topBool;
+			BooleanPredicateClausesStep<?,?> activeBool = topBool;
 			if (isNested) {
-				BooleanPredicateClausesStep<?> nestedBool = myPredicateFactory.bool();
+				BooleanPredicateClausesStep<?,?> nestedBool = myPredicateFactory.bool();
 				activeBool = nestedBool;
 			}
 
@@ -454,7 +454,7 @@ private boolean isNested(String theSearchParamName) {
 		}
 
 
-		private void addOnePredicate(BooleanPredicateClausesStep<?> theTopBool, boolean theIsMust,
+		private void addOnePredicate(BooleanPredicateClausesStep<?,?> theTopBool, boolean theIsMust,
 				String theParamName, IQueryParameterType theParameterType) {
 
 			if (theParameterType instanceof QuantityParam) {
@@ -466,7 +466,7 @@ private void addOnePredicate(BooleanPredicateClausesStep<?> theTopBool, boolean
 		}
 
 
-		private void addQuantityOrClauses(BooleanPredicateClausesStep<?> theTopBool, boolean theIsMust,
+		private void addQuantityOrClauses(BooleanPredicateClausesStep<?,?> theTopBool, boolean theIsMust,
 				String theSearchParamName, IQueryParameterType theParamType) {
 
 			String fieldPath = NESTED_SEARCH_PARAM_ROOT + "." + theSearchParamName + "." + INDEX_TYPE_QUANTITY;
@@ -479,7 +479,7 @@ private void addQuantityOrClauses(BooleanPredicateClausesStep<?> theTopBool, boo
 		}
 
 
-		private void addQuantityTerms(BooleanPredicateClausesStep<?> theTopBool, boolean theIsMust,
+		private void addQuantityTerms(BooleanPredicateClausesStep<?,?> theTopBool, boolean theIsMust,
 				ParamPrefixEnum theActivePrefix, QuantityParam theQtyParam, String theFieldPath) {
 
 			String valueFieldPath = theFieldPath + "." + QTY_VALUE;
@@ -496,12 +496,12 @@ private void addQuantityTerms(BooleanPredicateClausesStep<?> theTopBool, boolean
 		}
 
 
-		private void addFieldPredicate(boolean theIsMust, BooleanPredicateClausesStep<?> theTopBool, String theFieldPath, String theValue) {
+		private void addFieldPredicate(boolean theIsMust, BooleanPredicateClausesStep<?,?> theTopBool, String theFieldPath, String theValue) {
 			MatchPredicateOptionsStep<?> pred = myPredicateFactory.match().field(theFieldPath).matching(theValue);
 			addMustOrShould(theIsMust, theTopBool, pred);
 		}
 
-		private void addMustOrShould(boolean theIsMust, BooleanPredicateClausesStep<?> theTopBool, PredicateFinalStep thePredicate) {
+		private void addMustOrShould(boolean theIsMust, BooleanPredicateClausesStep<?,?> theTopBool, PredicateFinalStep thePredicate) {
 			if (theIsMust) {
 				theTopBool.must(thePredicate);
 			} else {