modified  the queryBuilder interface and the ConstraintResolver class