Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix in DBManager criteriaQuery to consider all filters #282

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Fix in DBManager criteriaQuery to consider all filters #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions modules/dbsupport/src/main/java/org/jpos/ee/DBManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,16 +263,18 @@ protected CriteriaQuery<T> createCriteriaQuery(boolean internalFilters, DBFilter

@SafeVarargs
protected final CriteriaQuery<T> createCriteriaQuery(boolean internalFilters, DBFilter<T>... filters) {
CriteriaQuery<T> query = createCriteriaQuery(internalFilters, (DBFilter<T>) null);
CriteriaBuilder cb = db.session().getCriteriaBuilder();
CriteriaQuery<T> query = cb.createQuery(clazz);
Root<T> root = query.from(clazz);
Predicate combinedPredicate = cb.and(Arrays.stream(filters)
.filter(f -> f != null)
.map(f -> f.createPredicate(cb, root))
.toArray(Predicate[]::new));
Predicate restriction = query.getRestriction();
if (restriction != null) {
combinedPredicate = cb.and(restriction,combinedPredicate);
Predicate[] mgrFilters = buildFilters(root);
if (mgrFilters != null) {
Predicate[] nonNullPredicates = Arrays.stream(mgrFilters).filter(f -> f != null).toArray(Predicate[]::new);
Predicate mgrPredicate = cb.and(nonNullPredicates);
combinedPredicate = cb.and(mgrPredicate, combinedPredicate);
}
query.distinct(true);
return query.where(combinedPredicate);
Expand Down