This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7-dev in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit d78d73c37b92acf71e8cd6417a942f4f4db83d4a Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sun Mar 22 14:56:14 2026 -0500 hibernate 7: more linting --- .../grails/orm/HibernateCriteriaBuilder.java | 30 ++++++++-------------- .../RootPersistentClassCommonValuesBinder.java | 1 + .../generator/GrailsSequenceGeneratorEnum.groovy | 2 +- .../generator/GrailsTableGenerator.java | 4 ++- .../HibernateDatastoreIntegrationSpec.groovy | 3 ++- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java index fd07b327d2..ceba4af686 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java +++ b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java @@ -142,7 +142,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport implements Bui @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") private boolean distinct = false; - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "PMD.CloseResource"}) public HibernateCriteriaBuilder(Class targetClass, SessionFactory sessionFactory, HibernateDatastore datastore) { this.targetClass = targetClass; setDatastore(datastore); @@ -162,23 +162,13 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport implements Bui } public final void setDatastore(HibernateDatastore datastore) { - if (MultiTenant.class.isAssignableFrom(targetClass) && - datastore.getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR) { + if (MultiTenant.class.isAssignableFrom(targetClass) + && datastore.getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR) { datastore.enableMultiTenancyFilter(); } } - public org.grails.datastore.mapping.query.api.Criteria createAlias(String associationPath, String alias) { - var prop = hibernateQuery.getEntity().getPropertyByName(associationPath); - if (prop instanceof org.grails.datastore.mapping.model.types.Basic) { - hibernateQuery.addAlias(new org.grails.orm.hibernate.query.HibernateAlias(associationPath, alias)); - return this; - } - hibernateQuery.getDetachedCriteria().createAlias(associationPath, alias); - return this; - } - - public org.grails.datastore.mapping.query.api.Criteria createAlias(String associationPath, String alias, int joinType) { + public Criteria createAlias(String associationPath, String alias) { var prop = hibernateQuery.getEntity().getPropertyByName(associationPath); if (prop instanceof org.grails.datastore.mapping.model.types.Basic) { hibernateQuery.addAlias(new org.grails.orm.hibernate.query.HibernateAlias(associationPath, alias)); @@ -1016,9 +1006,9 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport implements Bui */ @Override public Criteria order(String propertyName, String directionString) { - Query.Order.Direction direction = Query.Order.Direction.DESC.name().equalsIgnoreCase(directionString) ? - Query.Order.Direction.DESC : - Query.Order.Direction.ASC; + Query.Order.Direction direction = Query.Order.Direction.DESC.name().equalsIgnoreCase(directionString) + ? Query.Order.Direction.DESC + : Query.Order.Direction.ASC; hibernateQuery.order(new Query.Order(propertyName, direction)); return this; } @@ -1195,9 +1185,9 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport implements Bui @SuppressWarnings("rawtypes") @Override public Object invokeMethod(String name, Object obj) { - Object[] args = obj.getClass().isArray() ? - (Object[]) obj : - (obj instanceof Collection ? ((Collection) obj).toArray() : new Object[] {obj}); + Object[] args = obj.getClass().isArray() + ? (Object[]) obj + : (obj instanceof Collection ? ((Collection) obj).toArray() : new Object[] {obj}); return new CriteriaMethodInvoker(this).invokeMethod(name, args); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java index 241897b1cf..3303068b88 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java @@ -98,6 +98,7 @@ public class RootPersistentClassCommonValuesBinder { + root.getTable().getName()); } + identityBinder.bindIdentity(hibernatePersistentEntity, root); versionBinder.bindVersion(hibernatePersistentEntity.getVersion(), root); root.createPrimaryKey(); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy index 5ade00b97d..7ef4971c7f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy @@ -67,7 +67,7 @@ enum GrailsSequenceGeneratorEnum { return Optional.ofNullable(values().find { it.name == name }) } - static Generator getGenerator( + protected static Generator getGenerator( String name, GeneratorCreationContext context, Identity mappedId, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java index 42069c0c02..b7544d7abf 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java @@ -35,6 +35,8 @@ public class GrailsTableGenerator extends TableGenerator { @Serial private static final long serialVersionUID = 1L; + private static final String DEFAULT_ENTITY_NAME = "default"; + public GrailsTableGenerator(GeneratorCreationContext context, Identity mappedId, JdbcEnvironment jdbcEnvironment) { Properties generatorProps = Optional.ofNullable(mappedId).map(Identity::getProperties).orElse(new Properties()); @@ -43,7 +45,7 @@ public class GrailsTableGenerator extends TableGenerator { String propertyName = context.getProperty().getName(); // Use the name we just ensured exists in BasicValueIdCreator - String entityName = (mappedId != null && mappedId.getName() != null) ? mappedId.getName() : "default"; + String entityName = (mappedId != null && mappedId.getName() != null) ? mappedId.getName() : DEFAULT_ENTITY_NAME; generatorProps.put(SEGMENT_VALUE_PARAM, entityName + "." + propertyName); } diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy index f46c53971a..6455d36e5e 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy @@ -29,6 +29,7 @@ import org.testcontainers.containers.PostgreSQLContainer import org.testcontainers.spock.Testcontainers import spock.lang.Requires import spock.lang.Shared +import org.grails.datastore.mapping.core.connections.ConnectionSource @Testcontainers @Requires({ isDockerAvailable() }) @@ -109,7 +110,7 @@ class HibernateDatastoreIntegrationSpec extends HibernateGormDatastoreSpec { void "dataSourceName defaults to DEFAULT"() { expect: - datastore.dataSourceName == 'DEFAULT' + datastore.dataSourceName == ConnectionSource.DEFAULT } void "isAutoFlush is false when grails.gorm.autoFlush is not set"() {
