Migrating Hibernate Search 5.11.11.Final to any Hibernate Search 6 - spring

Question

Is there any way to avoid usage of BooleanJunction while migrating to Hibernate 6?
My (poor) understanding is that Hibernate 6 abandoned Quer DSL and is using JPA criteria instead. Code sample is just about 10 % of code that I have to cover all search cases and it uses more that shown here, meaning BooleanJunction is needed for this to work.
import javax.persistence.EntityManager;
import org.hibernate.search.jpa.FullTextEntityManager;
import org.hibernate.search.SearchFactory;
import org.hibernate.search.query.dsl.QueryContextBuilder;
import org.hibernate.search.query.dsl.EntityContext;
import org.hibernate.search.query.dsl.QueryBuilder;
// ...
#Autowired
private final EntityManager entityManager;
private static final Pattern SPACES =
Pattern.compile("\\s+", Pattern.UNICODE_CHARACTER_CLASS);
private static final int MIN_TOKEN_LENGTH = 2;
#AllArgsConstructor #Getter
public enum SearchField {
// there are 20 entries; here is one just to show
NAME(SearchField.NAME_STR, 20.0f);
private String fieldName;
private float boostFactor;
}
// ...
final FullTextEntityManager fullTextEntityManager =
Search.getFullTextEntityManager(this.entityManager);
final SearchFactory searchFactory =
fullTextEntityManager.getSearchFactory();
final QueryContextBuilder queryContextBuilder =
searchFactory.buildQueryBuilder();
final EntityContext entityContext =
queryContextBuilder.forEntity(clazz);
final QueryBuilder queryBuilder =
entityContext.get();
// ...
final String searchTerm = "some search term";
final String[] searchTerms =
Arrays.stream(SPACES.split(searchTerm))
.map(StringUtils::trimToNull)
.filter(Objects::nonNull)
.filter(s -> s.length() >= IndexingUtil.MIN_TOKEN_LENGTH)
.toArray(String[]::new);
final List<Query> queries = new LinkedList<>();
for (int i = 0; i < searchTerms.length; ++i) {
final String word = searchTerms[i];
queries.add(
queryBuilder
.bool()
.should(
QueryForField.q(
SearchField.NAME,
word,
queryBuilder
)
)
.boostedTo(SearchField.NAME.getBoostFactor()
);
);
}
// more queries are added, not only query by `name`
final BooleanJunction<?> master = queryBuilder.bool();
queries.stream().filter(Objects::nonNull).forEach(master::must);
final Query q = master.createQuery();