You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/02/21 17:21:45 UTC
(grails-core) 10/22: Remove PredicateGenerator from HibernateQuery
This is an automated email from the ASF dual-hosted git repository.
borinquenkid pushed a commit to branch 8.0.x-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 1a4f5b99cdc3b69d32ced5d33148ad7898aee3f1
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Feb 20 10:21:33 2026 -0600
Remove PredicateGenerator from HibernateQuery
---
.../grails/orm/hibernate/query/HibernateQuery.java | 8 ++---
.../hibernate/query/JpaCriteriaQueryCreator.java | 6 ++--
.../JpaCriteriaQueryCreatorSpec.groovy | 36 +++++++++++-----------
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java
index fbc6e15c82..53605fa7a5 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java
@@ -64,7 +64,7 @@ public class HibernateQuery extends Query {
protected LinkedList<Association> associationStack = new LinkedList<Association>();
protected DetachedCriteria detachedCriteria;
protected ProxyHandler proxyHandler = new HibernateProxyHandler();
- protected PredicateGenerator predicateGenerator;
+
private Integer fetchSize;
private Integer timeout;
private FlushMode flushMode;
@@ -73,7 +73,7 @@ public class HibernateQuery extends Query {
public HibernateQuery(AbstractHibernateSession session, PersistentEntity entity) {
super(session, entity);
this.detachedCriteria = new DetachedCriteria(entity.getJavaClass());
- this.predicateGenerator = new PredicateGenerator();
+
}
public void setDetachedCriteria(DetachedCriteria detachedCriteria) {
@@ -394,7 +394,7 @@ public class HibernateQuery extends Query {
}
public JpaCriteriaQuery<?> getJpaCriteriaQuery() {
- return new JpaCriteriaQueryCreator(projections, getCriteriaBuilder(), entity, detachedCriteria, predicateGenerator).createQuery();
+ return new JpaCriteriaQueryCreator(projections, getCriteriaBuilder(), entity, detachedCriteria).createQuery();
}
public void setFetchSize(Integer fetchSize) {
@@ -622,7 +622,7 @@ public class HibernateQuery extends Query {
hibernateQuery.offset(this.offset);
}
hibernateQuery.setDetachedCriteria(this.detachedCriteria.clone());
- hibernateQuery.predicateGenerator = this.predicateGenerator;
+
return hibernateQuery;
});
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaCriteriaQueryCreator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaCriteriaQueryCreator.java
index 3b970c44fa..e31645ea53 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaCriteriaQueryCreator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaCriteriaQueryCreator.java
@@ -21,20 +21,18 @@ public class JpaCriteriaQueryCreator {
private final HibernateCriteriaBuilder criteriaBuilder;
private final PersistentEntity entity;
private final DetachedCriteria detachedCriteria;
- private final PredicateGenerator predicateGenerator;
+
public JpaCriteriaQueryCreator(
Query.ProjectionList projections
, HibernateCriteriaBuilder criteriaBuilder
, PersistentEntity entity
, DetachedCriteria detachedCriteria
- , PredicateGenerator predicateGenerator
) {
this.projections = projections;
this.criteriaBuilder = criteriaBuilder;
this.entity = entity;
this.detachedCriteria = detachedCriteria;
- this.predicateGenerator = predicateGenerator;
}
public JpaCriteriaQuery<?> createQuery() {
@@ -135,7 +133,7 @@ public class JpaCriteriaQueryCreator {
private void assignCriteria(CriteriaQuery cq , From root, JpaFromProvider tablesByName, PersistentEntity entity) {
List<Query.Criterion> criteriaList =detachedCriteria.getCriteria();
if (!criteriaList.isEmpty()) {
- jakarta.persistence.criteria.Predicate[] predicates = predicateGenerator.getPredicates(criteriaBuilder, cq, root, criteriaList, tablesByName,entity);
+ jakarta.persistence.criteria.Predicate[] predicates = new PredicateGenerator().getPredicates(criteriaBuilder, cq, root, criteriaList, tablesByName,entity);
cq.where(criteriaBuilder.and(predicates));
}
}
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
index 9800ec8bfe..8ad54c2c23 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
@@ -22,9 +22,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var detachedCriteria = new DetachedCriteria(Person)
var projections = new Query.ProjectionList()
projections.property("firstName")
- var predicateGenerator = new PredicateGenerator()
+
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -42,9 +42,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var projections = new Query.ProjectionList()
projections.property("firstName")
projections.property("lastName")
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -61,9 +61,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var detachedCriteria = new DetachedCriteria(Person)
var projections = new Query.ProjectionList()
projections.count()
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -79,9 +79,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var detachedCriteria = new DetachedCriteria(Person)
var projections = new Query.ProjectionList()
projections.countDistinct("firstName")
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -97,9 +97,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var detachedCriteria = new DetachedCriteria(Person)
var projections = new Query.ProjectionList()
projections.id()
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -118,9 +118,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
projections.min("age")
projections.avg("age")
projections.sum("age")
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -140,9 +140,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var projections = new Query.ProjectionList()
projections.groupProperty("lastName")
projections.count()
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -159,9 +159,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
detachedCriteria.eq("firstName", "Bob")
var projections = new Query.ProjectionList()
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()
@@ -179,9 +179,9 @@ class JpaCriteriaQueryCreatorSpec extends HibernateGormDatastoreSpec {
var projections = new Query.ProjectionList()
projections.distinct()
projections.property("firstName")
- var predicateGenerator = new PredicateGenerator()
- var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria, predicateGenerator)
+
+ var creator = new JpaCriteriaQueryCreator(projections, criteriaBuilder, entity, detachedCriteria)
when:
JpaCriteriaQuery<?> query = creator.createQuery()